From 93732c8af4a545c617399600ee810081fdb42b07 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Jan 2015 19:21:39 +0000
Subject: [PATCH] Updated the whole of OpenFOAM to use the new templated
 TurbulenceModels library

The old separate incompressible and compressible libraries have been removed.

Most of the commonly used RANS and LES models have been upgraded to the
new framework but there are a few missing which will be added over the
next few days, in particular the realizable k-epsilon model.  Some of
the less common incompressible RANS models have been introduced into the
new library instantiated for incompressible flow only.  If they prove to
be generally useful they can be templated for compressible and
multiphase application.

The Spalart-Allmaras DDES and IDDES models have been thoroughly
debugged, removing serious errors concerning the use of S rather than
Omega.

The compressible instances of the models have been augmented by a simple
backward-compatible eddyDiffusivity model for thermal transport based on
alphat and alphaEff.  This will be replaced with a separate run-time
selectable thermal transport model framework in a few weeks.

For simplicity and ease of maintenance and further development the
turbulent transport and wall modeling is based on nut/nuEff rather than
mut/muEff for compressible models so that all forms of turbulence models
can use the same wall-functions and other BCs.

All turbulence model selection made in the constant/turbulenceProperties
dictionary with RAS and LES as sub-dictionaries rather than in separate
files which added huge complexity for multiphase.

All tutorials have been updated so study the changes and update your own
cases by comparison with similar cases provided.

Sorry for the inconvenience in the break in backward-compatibility but
this update to the turbulence modeling is an essential step in the
future of OpenFOAM to allow more models to be added and maintained for a
wider range of cases and physics.  Over the next weeks and months more
turbulence models will be added of single and multiphase flow, more
additional sub-models and further development and testing of existing
models.  I hope this brings benefits to all OpenFOAM users.

Henry G. Weller
---
 .../solvers/combustion/PDRFoam/Make/options   |   8 +-
 .../solvers/combustion/PDRFoam/PDRFoam.C      |   4 +-
 .../combustion/PDRFoam/PDRFoamAutoRefine.C    |   4 +-
 .../basicXiSubXiEq/basicXiSubXiEq.C           |   3 +-
 .../XiGModels/basicXiSubG/basicXiSubG.C       |   3 +-
 .../dragModels/PDRDragModel/PDRDragModel.H    |   4 +-
 .../PDRModels/dragModels/basic/basic.C        |   3 +-
 .../turbulence/PDRkEpsilon/PDRkEpsilon.C      |  40 +-
 .../turbulence/PDRkEpsilon/PDRkEpsilon.H      |  14 +-
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.C |   3 +-
 .../XiModels/XiEqModels/XiEqModel/XiEqModel.H |   4 +-
 .../XiModels/XiGModels/XiGModel/XiGModel.H    |   4 +-
 .../PDRFoam/XiModels/XiModel/XiModel.H        |   5 +-
 .../PDRFoam/XiModels/transport/transport.C    |   7 +-
 .../solvers/combustion/XiFoam/Make/options    |   8 +-
 .../solvers/combustion/XiFoam/XiFoam.C        |   4 +-
 .../solvers/combustion/chemFoam/Make/options  |   7 +-
 .../solvers/combustion/chemFoam/chemFoam.C    |   4 +-
 .../combustion/coldEngineFoam/Make/options    |   8 +-
 .../coldEngineFoam/coldEngineFoam.C           |   4 +-
 .../combustion/engineFoam/Make/options        |   8 +-
 .../combustion/engineFoam/engineFoam.C        |   4 +-
 .../solvers/combustion/fireFoam/Make/options  |   7 +-
 .../solvers/combustion/fireFoam/fireFoam.C    |   4 +-
 .../LTSReactingFoam/LTSReactingFoam.C         |   4 +-
 .../reactingFoam/LTSReactingFoam/Make/options |   8 +-
 .../combustion/reactingFoam/Make/options      |   8 +-
 .../combustion/reactingFoam/reactingFoam.C    |   4 +-
 .../rhoReactingBuoyantFoam/Make/options       |   8 +-
 .../rhoReactingBuoyantFoam.C                  |   4 +-
 .../reactingFoam/rhoReactingFoam/Make/options |   8 +-
 .../rhoReactingFoam/rhoReactingFoam.C         |   4 +-
 .../compressible/rhoCentralFoam/Make/options  |   8 +-
 .../rhoCentralDyMFoam/Make/options            |   8 +-
 .../rhoCentralDyMFoam/rhoCentralDyMFoam.C     |   4 +-
 .../rhoCentralFoam/rhoCentralFoam.C           |   4 +-
 .../compressible/rhoPimpleFoam/Make/options   |   8 +-
 .../rhoLTSPimpleFoam/Make/options             |   8 +-
 .../rhoLTSPimpleFoam/rhoLTSPimpleFoam.C       |   4 +-
 .../rhoPimpleDyMFoam/Make/options             |   8 +-
 .../rhoPimpleDyMFoam/rhoPimpleDyMFoam.C       |   4 +-
 .../rhoPimpleFoam/rhoPimpleFoam.C             |   4 +-
 .../rhoPimpleFoam/rhoPimplecFoam/Make/options |   8 +-
 .../rhoPimplecFoam/rhoPimplecFoam.C           |   4 +-
 .../compressible/rhoSimpleFoam/Make/options   |   8 +-
 .../rhoPorousSimpleFoam/Make/options          |   8 +-
 .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C |   4 +-
 .../rhoSimpleFoam/rhoSimpleFoam.C             |   4 +-
 .../rhoSimpleFoam/rhoSimplecFoam/Make/options |   7 +-
 .../rhoSimplecFoam/rhoSimplecFoam.C           |   4 +-
 .../compressible/sonicFoam/Make/options       |   8 +-
 .../sonicFoam/sonicDyMFoam/Make/options       |   8 +-
 .../sonicFoam/sonicDyMFoam/sonicDyMFoam.C     |   4 +-
 .../compressible/sonicFoam/sonicFoam.C        |   4 +-
 .../buoyantBoussinesqPimpleFoam/Make/options  |  22 +-
 .../buoyantBoussinesqPimpleFoam.C             |   2 +-
 .../buoyantBoussinesqSimpleFoam/Make/options  |  18 +-
 .../buoyantBoussinesqSimpleFoam.C             |   2 +-
 .../buoyantPimpleFoam/Make/options            |   9 +-
 .../buoyantPimpleFoam/buoyantPimpleFoam.C     |   4 +-
 .../buoyantSimpleFoam/Make/options            |   9 +-
 .../buoyantSimpleFoam/buoyantSimpleFoam.C     |   4 +-
 .../chtMultiRegionFoam/Make/options           |   8 +-
 .../chtMultiRegionFoam/chtMultiRegionFoam.C   |   4 +-
 .../chtMultiRegionSimpleFoam/Make/options     |  10 +-
 .../chtMultiRegionSimpleFoam.C                |   4 +-
 .../heatTransfer/thermoFoam/Make/options      |  12 +-
 .../heatTransfer/thermoFoam/thermoFoam.C      |   6 +-
 .../adjointShapeOptimizationFoam/Make/options |   8 +-
 .../adjointShapeOptimizationFoam.C            |   2 +-
 .../incompressible/boundaryFoam/Make/options  |   8 +-
 .../boundaryFoam/boundaryFoam.C               |   2 +-
 .../incompressible/pimpleFoam/Make/options    |   8 +-
 .../pimpleFoam/SRFPimpleFoam/Make/options     |   8 +-
 .../pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C  |   2 +-
 .../pimpleFoam/pimpleDyMFoam/Make/options     |   8 +-
 .../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C  |   2 +-
 .../incompressible/pimpleFoam/pimpleFoam.C    |   2 +-
 .../incompressible/pisoFoam/Make/options      |   8 +-
 .../incompressible/pisoFoam/pisoFoam.C        |   2 +-
 .../incompressible/simpleFoam/Make/options    |   8 +-
 .../simpleFoam/SRFSimpleFoam/Make/options     |   9 +-
 .../simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C  |   2 +-
 .../simpleFoam/porousSimpleFoam/Make/options  |   8 +-
 .../porousSimpleFoam/porousSimpleFoam.C       |   2 +-
 .../incompressible/simpleFoam/simpleFoam.C    |   2 +-
 .../DPMTurbulenceModels/DPMTurbulenceModels.C |   4 +-
 .../lagrangian/DPMFoam/MPPICFoam/Make/options |   2 +-
 .../solvers/lagrangian/DPMFoam/Make/options   |   2 +-
 .../lagrangian/coalChemistryFoam/Make/options |   9 +-
 .../coalChemistryFoam/coalChemistryFoam.C     |   4 +-
 .../Make/options                              |   7 +-
 .../Make/options                              |   7 +-
 .../icoUncoupledKinematicParcelDyMFoam.C      |   4 +-
 .../icoUncoupledKinematicParcelFoam.C         |   4 +-
 .../reactingParcelFilmFoam/Make/options       |   7 +-
 .../reactingParcelFilmFoam.C                  |   4 +-
 .../LTSReactingParcelFoam.C                   |   4 +-
 .../LTSReactingParcelFoam/Make/options        |   8 +-
 .../reactingParcelFoam/Make/options           |   8 +-
 .../reactingParcelFoam/reactingParcelFoam.C   |   4 +-
 .../simpleReactingParcelFoam/Make/options     |   8 +-
 .../simpleReactingParcelFoam.C                |   4 +-
 .../solvers/lagrangian/sprayFoam/Make/options |   8 +-
 .../sprayFoam/sprayEngineFoam/Make/options    |   8 +-
 .../sprayEngineFoam/sprayEngineFoam.C         |   4 +-
 .../solvers/lagrangian/sprayFoam/sprayFoam.C  |   4 +-
 .../uncoupledKinematicParcelFoam/Make/options |   8 +-
 .../uncoupledKinematicParcelFoam.C            |   4 +-
 .../multiphase/cavitatingFoam/Make/options    |  13 +-
 .../cavitatingDyMFoam/Make/options            |  15 +-
 .../cavitatingDyMFoam/cavitatingDyMFoam.C     |   4 +-
 .../cavitatingFoam/cavitatingFoam.C           |   4 +-
 .../compressibleInterFoam/Make/options        |   8 +-
 .../compressibleInterDyMFoam/Make/options     |   8 +-
 .../compressibleInterDyMFoam.C                |   4 +-
 .../compressibleInterFoam.C                   |   4 +-
 .../Make/options                              |   8 +-
 .../compressibleMultiphaseInterFoam.C         |   4 +-
 .../interFoam/LTSInterFoam/LTSInterFoam.C     |   4 +-
 .../interFoam/LTSInterFoam/Make/options       |   8 +-
 .../solvers/multiphase/interFoam/Make/options |   8 +-
 .../interFoam/interDyMFoam/Make/options       |   8 +-
 .../interFoam/interDyMFoam/interDyMFoam.C     |   4 +-
 .../solvers/multiphase/interFoam/interFoam.C  |   4 +-
 .../interFoam/interMixingFoam/Make/options    |   8 +-
 .../interMixingFoam/interMixingFoam.C         |   4 +-
 .../interFoam/porousInterFoam/Make/options    |   8 +-
 .../porousInterFoam/porousInterFoam.C         |   4 +-
 .../interPhaseChangeFoam/Make/options         |   8 +-
 .../interPhaseChangeDyMFoam/Make/options      |   8 +-
 .../interPhaseChangeDyMFoam.C                 |   4 +-
 .../interPhaseChangeFoam.C                    |   4 +-
 .../multiphaseEulerFoam/Make/options          |   8 +-
 .../multiphase/multiphaseEulerFoam/UEqns.H    |   2 +-
 .../multiphaseEulerFoam/createFields.H        |   6 +-
 .../multiphaseEulerFoam/multiphaseEulerFoam.C |   6 +-
 .../multiphaseInterFoam/Make/options          |   8 +-
 .../multiphaseInterDyMFoam/Make/options       |   8 +-
 .../multiphaseInterDyMFoam.C                  |   4 +-
 .../multiphaseInterFoam/multiphaseInterFoam.C |   4 +-
 .../potentialFreeSurfaceFoam/Make/options     |   8 +-
 .../potentialFreeSurfaceDyMFoam/Make/options  |   8 +-
 .../potentialFreeSurfaceDyMFoam.C             |   2 +-
 .../potentialFreeSurfaceFoam.C                |   2 +-
 .../twoLiquidMixingFoam/Make/options          |   9 +-
 .../twoLiquidMixingFoam/twoLiquidMixingFoam.C |   4 +-
 applications/test/PisoFoam/Make/files         |   3 -
 applications/test/PisoFoam/Make/options       |  14 -
 applications/test/PisoFoam/PisoFoam.C         | 149 -----
 applications/test/PisoFoam/turbulenceModel.H  |   9 -
 applications/test/RhoPimpleFoam/EEqn.H        |  33 -
 applications/test/RhoPimpleFoam/Make/files    |   3 -
 applications/test/RhoPimpleFoam/Make/options  |  21 -
 .../test/RhoPimpleFoam/rhoPimpleFoam.C        | 107 ----
 .../test/RhoPimpleFoam/turbulenceModel.H      |   9 -
 .../mesh/advanced/PDRMesh/Make/options        |   6 +-
 .../foamDebugSwitches/Make/options            |  13 +-
 .../miscellaneous/foamHelp/Make/options       |   9 +-
 .../foamHelp/helpTypes/Make/options           |   9 +-
 .../execFlowFunctionObjects/Make/options      |  12 +-
 .../execFlowFunctionObjects.C                 |  11 +-
 .../stressField/stressComponents/Make/options |  10 +-
 .../postProcessing/turbulence/R/Make/options  |  15 +-
 .../utilities/postProcessing/turbulence/R/R.C |   8 +-
 .../createTurbulenceFields/Make/options       |  12 +-
 .../createTurbulenceFields.C                  |   7 +-
 .../velocityField/Pe/Make/options             |  12 +-
 .../postProcessing/velocityField/Pe/Pe.C      |   9 +-
 .../wall/wallHeatFlux/Make/options            |  10 +-
 .../wall/wallHeatFlux/wallHeatFlux.C          |   4 +-
 .../wall/wallShearStress/Make/options         |   8 +-
 .../wall/wallShearStress/wallShearStress.C    |   9 +-
 .../postProcessing/wall/yPlusLES/Make/options |  13 +-
 .../postProcessing/wall/yPlusLES/yPlusLES.C   |   8 +-
 .../postProcessing/wall/yPlusRAS/Make/options |  16 +-
 .../postProcessing/wall/yPlusRAS/yPlusRAS.C   |  42 +-
 .../applyBoundaryLayer/Make/options           |  12 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   |   4 +-
 .../Make/files                                |   3 -
 .../Make/options                              |  13 -
 .../applyWallFunctionBoundaryConditions.C     | 363 -----------
 .../Make/options                              |   3 +-
 .../faceAgglomerate/Make/options              |   1 -
 .../preProcessing/viewFactorsGen/Make/options |   1 -
 src/Allwmake                                  |   1 -
 .../physicoChemicalConstants.H                |   2 +-
 .../CompressibleTurbulenceModel.C             |   3 +-
 .../CompressibleTurbulenceModel.H             |   3 +-
 src/TurbulenceModels/compressible/Make/files  |  17 +-
 .../compressible/Make/options                 |   6 +-
 .../SpecificCompressibleTurbulenceModel.C     |  99 +++
 .../SpecificCompressibleTurbulenceModel.H}    |  78 ++-
 .../compressibleTurbulenceModel.H             |   8 +-
 .../eddyDiffusivity/eddyDiffusivity.C         | 146 +++++
 .../eddyDiffusivity/eddyDiffusivity.H         | 180 ++++++
 .../thermalDiffusivity/thermalDiffusivity.C   | 124 ++++
 .../thermalDiffusivity/thermalDiffusivity.H   | 176 +++++
 .../compressible}/turbulenceModelDoc.H        |   4 +-
 ...convectiveHeatTransferFvPatchScalarField.C |  26 +-
 ...convectiveHeatTransferFvPatchScalarField.H |   2 +-
 ...oupledTemperatureMixedFvPatchScalarField.C |  17 +-
 ...oupledTemperatureMixedFvPatchScalarField.H |   2 +-
 ...allHeatFluxTemperatureFvPatchScalarField.C |   2 +-
 ...allHeatFluxTemperatureFvPatchScalarField.H |   2 +-
 .../temperatureCoupledBase.C                  |  13 +-
 .../temperatureCoupledBase.H                  |   2 +-
 .../thermalBaffle1DFvPatchScalarField.C       |   8 +-
 .../thermalBaffle1DFvPatchScalarField.H       |   2 +-
 .../thermalBaffle1DFvPatchScalarFields.C      |   2 +-
 .../thermalBaffle1DFvPatchScalarFields.H      |   2 +-
 ...RateAdvectiveDiffusiveFvPatchScalarField.C |  21 +-
 ...RateAdvectiveDiffusiveFvPatchScalarField.H |   2 +-
 ...entHeatFluxTemperatureFvPatchScalarField.C |   2 +-
 ...entHeatFluxTemperatureFvPatchScalarField.H |   2 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.C |   2 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.H |   2 +-
 ...eratureRadCoupledMixedFvPatchScalarField.C |   2 +-
 ...eratureRadCoupledMixedFvPatchScalarField.H |   2 +-
 ...ayatillekeWallFunctionFvPatchScalarField.C |  27 +-
 ...ayatillekeWallFunctionFvPatchScalarField.H |   2 +-
 .../alphatWallFunctionFvPatchScalarField.C    |  29 +-
 .../alphatWallFunctionFvPatchScalarField.H    |  13 +-
 .../wallHeatTransferFvPatchScalarField.C      |  10 +-
 .../wallHeatTransferFvPatchScalarField.H      |   2 +-
 .../makeTurbulenceModel.H                     | 128 ++++
 .../turbulentFluidThermoModel.H}              |  51 +-
 .../turbulentFluidThermoModels.C}             |  27 +-
 .../IncompressibleTurbulenceModel.C           |  30 +-
 .../IncompressibleTurbulenceModel.H           |  13 +-
 .../incompressible/Make/files                 |  19 +-
 .../incompressible/Make/options               |   2 +-
 .../SpecificIncompressibleTurbulenceModel.C   |  98 +++
 .../SpecificIncompressibleTurbulenceModel.H}  |  76 ++-
 .../incompressible}/turbulenceModelDoc.H      |   4 +-
 .../RAS/LamBremhorstKE/LamBremhorstKE.C       | 133 ++--
 .../RAS/LamBremhorstKE/LamBremhorstKE.H       |  45 +-
 .../RAS/LienCubicKE/LienCubicKE.C             | 245 +++----
 .../RAS/LienCubicKE/LienCubicKE.H             |  44 +-
 .../RAS/LienCubicKELowRe/LienCubicKELowRe.C   | 285 +++------
 .../RAS/LienCubicKELowRe/LienCubicKELowRe.H   |  47 +-
 .../LienCubicKELowReSetWallDissipation.H      |   0
 .../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 155 ++---
 .../LienLeschzinerLowRe/LienLeschzinerLowRe.H |  46 +-
 .../LienLeschzinerLowReSetWallDissipation.H   |   0
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             | 142 ++---
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |  44 +-
 .../fWallFunctionFvPatchScalarField.C         |  23 +-
 .../fWallFunctionFvPatchScalarField.H         |   6 +-
 .../v2WallFunctionFvPatchScalarField.C        |  22 +-
 .../v2WallFunctionFvPatchScalarField.H        |   6 +-
 .../RAS/include/nonLinearWallFunctionsI.H     |   2 +-
 .../RAS/include/wallDissipationI.H            |   2 +-
 .../RAS/include/wallNonlinearViscosityI.H     |   2 +-
 .../RAS/kOmega/Changes                        | 144 +++++
 .../RAS/kOmega/kOmega.C                       | 140 ++--
 .../RAS/kOmega/kOmega.H                       |  45 +-
 .../RAS/kkLOmega/kkLOmega.C                   | 152 ++---
 .../RAS/kkLOmega/kkLOmega.H                   |  46 +-
 .../RAS/nonlinearKEShih/nonlinearKEShih.C}    | 188 ++----
 .../RAS/nonlinearKEShih/nonlinearKEShih.H}    |  63 +-
 .../RAS/qZeta/qZeta.C                         | 146 ++---
 .../RAS/qZeta/qZeta.H                         |  86 +--
 .../turbulentTransportModels}/RAS/v2f/v2f.C   | 164 ++---
 .../turbulentTransportModels}/RAS/v2f/v2f.H   |  76 +--
 ...ayatillekeWallFunctionFvPatchScalarField.C |  22 +-
 ...ayatillekeWallFunctionFvPatchScalarField.H |   2 +-
 .../turbulentTransportModel.H}                |  47 +-
 .../turbulentTransportModels.C}               |  19 +-
 .../PhaseCompressibleTurbulenceModel.C        |   3 +-
 .../PhaseCompressibleTurbulenceModel.H        |   3 +-
 .../PhaseIncompressibleTurbulenceModel.C      |   3 +-
 .../PhaseIncompressibleTurbulenceModel.H      |   3 +-
 .../turbulenceModels/LES/LESModel/LESModel.C  |   5 +-
 .../LES/LESdeltas}/IDDESDelta/IDDESDelta.C    | 100 +--
 .../LES/LESdeltas}/IDDESDelta/IDDESDelta.H    |  21 +-
 .../LES/LESdeltas/LESdelta/LESdelta.C         |  32 +-
 .../LES/LESdeltas/LESdelta/LESdelta.H         |  37 +-
 .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.C |  29 +-
 .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.H |   9 +-
 .../cubeRootVolDelta/cubeRootVolDelta.C       |  31 +-
 .../cubeRootVolDelta/cubeRootVolDelta.H       |   9 +-
 .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C   |  45 +-
 .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H   |   9 +-
 .../LES/LESdeltas/smoothDelta/smoothDelta.C   |  53 +-
 .../LES/LESdeltas/smoothDelta/smoothDelta.H   |  31 +-
 .../smoothDelta/smoothDeltaDeltaDataI.H       |  50 +-
 .../vanDriestDelta/vanDriestDelta.C           |  88 +--
 .../vanDriestDelta/vanDriestDelta.H           |  20 +-
 .../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 119 ++--
 .../SpalartAllmarasDDES/SpalartAllmarasDDES.H |  60 +-
 .../SpalartAllmarasDES/SpalartAllmarasDES.C   | 454 +++++++++++++
 .../SpalartAllmarasDES/SpalartAllmarasDES.H}  | 180 +++---
 .../SpalartAllmarasIDDES.C                    | 137 ++--
 .../SpalartAllmarasIDDES.H                    |  71 ++-
 .../LES/eddyViscosity/LESeddyViscosity.C      |   6 +-
 .../turbulenceModels/LES/kEqn/kEqn.H          |  12 +-
 .../turbulenceModels/Make/files               |  12 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     | 310 +++++++++
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     | 109 ++--
 .../turbulenceModels/RAS/RASModel/RASModel.C  |   3 +-
 .../turbulenceModels/RAS/RASModel/RASModel.H  |   8 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     | 389 +++++++++++
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     | 108 ++--
 .../atmBoundaryLayer/atmBoundaryLayer.C       |   5 +-
 .../atmBoundaryLayer/atmBoundaryLayer.H       |   9 +-
 ...ndaryLayerInletEpsilonFvPatchScalarField.C | 116 +---
 ...ndaryLayerInletEpsilonFvPatchScalarField.H | 107 +---
 ...atmBoundaryLayerInletKFvPatchScalarField.C |   5 +-
 ...atmBoundaryLayerInletKFvPatchScalarField.H |  15 +-
 ...daryLayerInletVelocityFvPatchVectorField.C | 140 +---
 ...daryLayerInletVelocityFvPatchVectorField.H | 125 +---
 .../v2WallFunctionFvPatchScalarField.C        |  11 +-
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.C  |  80 +--
 .../turbulenceModels/RAS/kEpsilon/kEpsilon.H  |  26 +-
 .../RAS/kOmegaSST/kOmegaSST.H                 |  18 +-
 .../ReynoldsStress/ReynoldsStress.C           | 221 +++++++
 .../ReynoldsStress/ReynoldsStress.H}          | 119 ++--
 .../eddyViscosity/eddyViscosity.C             |  60 +-
 .../eddyViscosity/eddyViscosity.H             |  14 +-
 .../turbulenceModels/laminar/laminar.C        |  56 +-
 .../turbulenceModels/laminar/laminar.H        |  18 +-
 .../linearViscousStress/linearViscousStress.C | 129 ++++
 .../linearViscousStress.H}                    |  95 ++-
 .../nonlinearEddyViscosity.C                  | 135 ++++
 .../nonlinearEddyViscosity.H}                 |  96 ++-
 .../turbulenceModels/turbulenceModel.H        |   5 +-
 .../turbulenceModels/turbulenceModelDoc.H     |   6 +-
 src/combustionModels/FSD/FSD.C                |   4 +-
 src/combustionModels/Make/options             |  10 +-
 src/combustionModels/PaSR/PaSR.H              |   4 +-
 .../combustionModel/combustionModel.H         |   4 +-
 src/fvOptions/Make/options                    |   9 +-
 .../variableHeatTransfer.C                    |   9 +-
 src/lagrangian/Allwmake                       |   1 -
 src/lagrangian/Turbulence/Make/options        |   1 +
 .../makeThermoParcelTurbulenceForces.H}       |  20 +-
 .../DispersionRASModel/DispersionRASModel.C   |   4 +-
 .../BrownianMotion/BrownianMotionForce.C      | 214 +++++++
 .../BrownianMotion/BrownianMotionForce.H      | 160 +++++
 .../BrownianMotion/BrownianMotionForceI.H}    |  26 +-
 src/lagrangian/coalCombustion/Make/options    |  11 +-
 .../COxidationHurtMitchell.C                  |   4 +-
 .../COxidationIntrinsicRate.C                 |   8 +-
 .../COxidationKineticDiffusionLimitedRate.C   |   6 +-
 .../COxidationMurphyShaddix.C                 |   8 +-
 .../ReactingMultiphaseParcel.C                |   4 +-
 .../Templates/ReactingParcel/ReactingParcel.C |  11 +-
 .../LiquidEvaporation/LiquidEvaporation.C     |   6 +-
 .../LiquidEvaporationBoil.C                   |   4 +-
 .../SingleKineticRateDevolatilisation.C       |   4 +-
 src/lagrangian/spray/Make/options             |  11 +-
 .../Templates/SprayParcel/SprayParcel.C       |  10 +-
 src/lagrangian/turbulence/Make/options        |  17 +-
 .../DispersionRASModel/DispersionRASModel.C   |  10 +-
 .../BrownianMotion/BrownianMotionForce.C      |   8 +-
 src/meshTools/sets/topoSets/topoSet.C         |   8 +-
 .../functionObjects/forces/Make/options       |  12 +-
 .../functionObjects/forces/forces/forces.C    |  16 +-
 .../DESModelRegions/DESModelRegions.C         |  10 +-
 .../functionObjects/utilities/Make/files      |  19 +-
 .../functionObjects/utilities/Make/options    |  13 +-
 .../functionObjects/utilities/Peclet/Peclet.C |  19 +-
 .../scalarTransport/scalarTransport.C         |  16 +-
 .../turbulenceFields/turbulenceFields.C       |   4 +-
 .../wallShearStress/wallShearStress.C         |  10 +-
 .../utilities/yPlusRAS/yPlusRAS.C             | 103 +--
 .../utilities/yPlusRAS/yPlusRAS.H             |   9 +-
 src/regionCoupled/Make/options                |   6 +-
 .../energyRegionCoupledFvPatchScalarField.C   |   8 +-
 src/regionModels/pyrolysisModels/Make/options |  13 +-
 src/regionModels/regionCoupling/Make/options  |  11 +-
 .../wallFunctions/Make/files                  |   3 +-
 .../wallFunctions/Make/options                |  11 +-
 ...alphatFilmWallFunctionFvPatchScalarField.C |  29 +-
 .../nutkFilmWallFunctionFvPatchScalarField.C} | 108 ++--
 .../nutkFilmWallFunctionFvPatchScalarField.H} |  48 +-
 .../thermalBaffleModels/Make/options          |   6 +-
 .../liquidMixtureProperties.C                 |   2 +-
 .../solidProperties/solidPropertiesI.H        |   2 +-
 .../PengRobinsonGas/PengRobinsonGas.C         |   2 +-
 .../incompressiblePerfectGasI.H               |   2 +-
 .../equationOfState/perfectGas/perfectGasI.H  |   2 +-
 .../specie/specie/specie.H                    |   2 +-
 .../thermo/hExponential/hExponentialThermoI.H |   2 +-
 .../thermo/hPolynomial/hPolynomialThermo.C    |   2 +-
 .../specie/thermo/janaf/janafThermoI.H        |   2 +-
 .../specie/thermo/thermo/thermo.H             |   2 +-
 .../specie/thermo/thermo/thermoI.H            |   2 +-
 src/turbulenceModels/Allwmake                 |  14 -
 src/turbulenceModels/LES/Allwmake             |  14 -
 .../LES/LESdeltas/LESdelta/LESdelta.C         | 138 ----
 .../LES/LESdeltas/LESdelta/LESdelta.H         | 160 -----
 src/turbulenceModels/LES/LESdeltas/Make/files |   7 -
 .../LES/LESdeltas/Make/options                |   9 -
 .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.C | 102 ---
 .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.H | 110 ----
 .../cubeRootVolDelta/cubeRootVolDelta.C       | 117 ----
 .../cubeRootVolDelta/cubeRootVolDelta.H       | 108 ----
 .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C   | 149 -----
 .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H   | 113 ----
 .../LES/LESdeltas/smoothDelta/smoothDelta.C   | 197 ------
 .../LES/LESdeltas/smoothDelta/smoothDelta.H   | 290 ---------
 .../smoothDelta/smoothDeltaDeltaDataI.H       | 227 -------
 .../LES/LESfilters/LESfilter/LESfilter.C      |  67 --
 .../LES/LESfilters/LESfilter/LESfilter.H      | 158 -----
 .../LES/LESfilters/Make/files                 |   6 -
 .../LES/LESfilters/Make/options               |   4 -
 .../anisotropicFilter/anisotropicFilter.C     | 239 -------
 .../anisotropicFilter/anisotropicFilter.H     | 131 ----
 .../LESfilters/laplaceFilter/laplaceFilter.C  | 151 -----
 .../LESfilters/laplaceFilter/laplaceFilter.H  | 132 ----
 .../LESfilters/simpleFilter/simpleFilter.C    | 128 ----
 .../LESfilters/simpleFilter/simpleFilter.H    | 121 ----
 src/turbulenceModels/compressible/Allwmake    |  13 -
 .../compressible/LES/DESModel/DESModel.C      |  57 --
 .../compressible/LES/DESModel/DESModelDoc.H   |  32 -
 .../DeardorffDiffStress/DeardorffDiffStress.C | 166 -----
 .../DeardorffDiffStress/DeardorffDiffStress.H | 150 -----
 .../LES/GenEddyVisc/GenEddyVisc.C             | 157 -----
 .../LES/GenEddyVisc/GenEddyVisc.H             | 172 -----
 .../LES/GenSGSStress/GenSGSStress.C           | 178 ------
 .../LES/GenSGSStress/GenSGSStress.H           | 198 ------
 .../compressible/LES/LESModel/LESModel.C      | 209 ------
 .../compressible/LES/LESModel/LESModel.H      | 304 ---------
 .../compressible/LES/LESModel/LESModelDoc.H   |  32 -
 .../compressible/LES/Make/files               |  16 -
 .../compressible/LES/Make/options             |  14 -
 .../LES/Smagorinsky/Smagorinsky.C             | 125 ----
 .../LES/Smagorinsky/Smagorinsky.H             | 153 -----
 .../LES/SpalartAllmaras/SpalartAllmaras.C     | 445 -------------
 .../LES/SpalartAllmaras/SpalartAllmaras.H     | 214 -------
 .../compressibleLESdelta.C                    |  66 --
 .../compressibleLESdelta.H                    | 109 ----
 .../homogeneousDynOneEqEddy.C                 | 191 ------
 .../homogeneousDynOneEqEddy.H                 | 161 -----
 .../LES/lowReOneEqEddy/lowReOneEqEddy.C       | 165 -----
 .../LES/lowReOneEqEddy/lowReOneEqEddy.H       | 152 -----
 .../compressible/LES/oneEqEddy/oneEqEddy.C    | 151 -----
 .../compressible/LES/oneEqEddy/oneEqEddy.H    | 156 -----
 .../LES/vanDriestDelta/vanDriestDelta.C       | 161 -----
 .../LES/vanDriestDelta/vanDriestDelta.H       | 113 ----
 .../compressible/RAS/LRR/LRR.C                | 483 --------------
 .../compressible/RAS/LRR/LRR.H                | 210 ------
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 524 ---------------
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 220 -------
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     | 363 -----------
 .../compressible/RAS/Make/files               |  55 --
 .../compressible/RAS/Make/options             |  13 -
 .../compressible/RAS/RASModel/RASModel.C      | 210 ------
 .../compressible/RAS/RASModel/RASModel.H      | 268 --------
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             | 372 -----------
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             | 210 ------
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     | 479 --------------
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     | 233 -------
 .../backwardsCompatibilityWallFunctions.C     | 357 -----------
 .../backwardsCompatibilityWallFunctions.H     | 129 ----
 ...wardsCompatibilityWallFunctionsTemplates.C | 169 -----
 .../compressibleRASBoundaryConditionsDoc.H    |  39 --
 ...thDissipationRateInletFvPatchScalarField.C | 179 ------
 ...thDissipationRateInletFvPatchScalarField.H | 203 ------
 ...ngLengthFrequencyInletFvPatchScalarField.C | 180 ------
 ...ngLengthFrequencyInletFvPatchScalarField.H | 202 ------
 ...silonLowReWallFunctionFvPatchScalarField.C | 196 ------
 ...silonLowReWallFunctionFvPatchScalarField.H | 190 ------
 .../epsilonWallFunctionFvPatchScalarField.C   | 586 -----------------
 .../epsilonWallFunctionFvPatchScalarField.H   | 292 ---------
 .../fWallFunctionFvPatchScalarField.C         | 263 --------
 .../fWallFunctionFvPatchScalarField.H         | 209 ------
 .../kLowReWallFunctionFvPatchScalarField.C    | 255 --------
 .../kLowReWallFunctionFvPatchScalarField.H    | 207 ------
 .../kqRWallFunctionFvPatchField.C             | 150 -----
 .../kqRWallFunctionFvPatchField.H             | 182 ------
 .../kqRWallFunctionFvPatchFields.C            |  47 --
 .../mutLowReWallFunctionFvPatchScalarField.C  | 133 ----
 .../mutLowReWallFunctionFvPatchScalarField.H  | 168 -----
 .../mutURoughWallFunctionFvPatchScalarField.C | 315 ---------
 .../mutURoughWallFunctionFvPatchScalarField.H | 240 -------
 ...tUSpaldingWallFunctionFvPatchScalarField.C | 223 -------
 ...tUSpaldingWallFunctionFvPatchScalarField.H | 190 ------
 .../mutUWallFunctionFvPatchScalarField.C      | 201 ------
 .../mutUWallFunctionFvPatchScalarField.H      | 176 -----
 .../mutWallFunctionFvPatchScalarField.C       | 187 ------
 .../mutWallFunctionFvPatchScalarField.H       | 181 ------
 .../mutkRoughWallFunctionFvPatchScalarField.C | 241 -------
 .../mutkRoughWallFunctionFvPatchScalarField.H | 206 ------
 .../mutkWallFunctionFvPatchScalarField.C      | 163 -----
 .../mutkWallFunctionFvPatchScalarField.H      | 168 -----
 .../omegaWallFunctionFvPatchScalarField.C     | 603 ------------------
 .../omegaWallFunctionFvPatchScalarField.H     | 298 ---------
 .../v2WallFunctionFvPatchScalarField.C        | 254 --------
 .../v2WallFunctionFvPatchScalarField.H        | 211 ------
 .../compressible/RAS/kEpsilon/kEpsilon.C      | 344 ----------
 .../compressible/RAS/kEpsilon/kEpsilon.H      | 200 ------
 .../compressible/RAS/kOmegaSST/kOmegaSST.C    | 511 ---------------
 .../compressible/RAS/kOmegaSST/kOmegaSST.H    | 316 ---------
 .../compressible/RAS/laminar/laminar.C        | 218 -------
 .../compressible/RAS/laminar/laminar.H        | 140 ----
 .../RAS/realizableKE/realizableKE.C           | 384 -----------
 .../RAS/realizableKE/realizableKE.H           | 214 -------
 .../compressible/RAS/v2f/v2f.C                | 493 --------------
 .../compressible/RAS/v2f/v2f.H                | 288 ---------
 .../compressible/turbulenceModel/Make/files   |  15 -
 .../compressible/turbulenceModel/Make/options |  17 -
 .../turbulenceModel/laminar/laminar.C         | 246 -------
 .../turbulenceModel/laminar/laminar.H         | 177 -----
 .../turbulenceModel/turbulenceModel.C         | 155 -----
 .../turbulenceModel/turbulenceModel.H         | 282 --------
 .../derivedFvPatchFields/Make/files           |   4 -
 .../derivedFvPatchFields/Make/options         |  16 -
 .../fixedShearStressFvPatchVectorField.C      | 186 ------
 .../fixedShearStressFvPatchVectorField.H      | 154 -----
 .../porousBafflePressureFvPatchField.C        | 121 ----
 .../porousBafflePressureFvPatchField.H        | 216 -------
 .../porousBafflePressureFvPatchFields.C       | 121 ----
 src/turbulenceModels/incompressible/Allwmake  |  13 -
 .../incompressible/LES/DESModel/DESModel.C    |  56 --
 .../incompressible/LES/DESModel/DESModelDoc.H |  32 -
 .../DeardorffDiffStress/DeardorffDiffStress.C | 162 -----
 .../DeardorffDiffStress/DeardorffDiffStress.H | 148 -----
 .../LES/GenEddyVisc/GenEddyVisc.C             | 149 -----
 .../LES/GenEddyVisc/GenEddyVisc.H             | 170 -----
 .../LES/GenSGSStress/GenSGSStress.C           | 230 -------
 .../LES/GenSGSStress/GenSGSStress.H           | 192 ------
 .../incompressible/LES/LESModel/LESModel.C    | 207 ------
 .../incompressible/LES/LESModel/LESModel.H    | 246 -------
 .../incompressible/LES/LESModel/LESModelDoc.H |  32 -
 .../LES/LRRDiffStress/LRRDiffStress.C         | 176 -----
 .../LES/LRRDiffStress/LRRDiffStress.H         | 145 -----
 .../incompressible/LES/Make/files             |  34 -
 .../incompressible/LES/Make/options           |  14 -
 .../LES/Smagorinsky/Smagorinsky.C             | 112 ----
 .../LES/Smagorinsky/Smagorinsky.H             | 147 -----
 .../LES/Smagorinsky2/Smagorinsky2.C           | 147 -----
 .../LES/SpalartAllmaras/SpalartAllmaras.C     | 463 --------------
 .../LES/dynLagrangian/dynLagrangian.C         | 197 ------
 .../LES/dynLagrangian/dynLagrangian.H         | 196 ------
 .../LES/dynOneEqEddy/dynOneEqEddy.C           | 196 ------
 .../LES/dynOneEqEddy/dynOneEqEddy.H           | 184 ------
 .../homogeneousDynOneEqEddy.C                 | 209 ------
 .../homogeneousDynOneEqEddy.H                 | 162 -----
 .../homogeneousDynSmagorinsky.C               | 181 ------
 .../homogeneousDynSmagorinsky.H               | 166 -----
 .../incompressibleLESdelta.C                  |  66 --
 .../incompressibleLESdelta.H                  | 109 ----
 .../LES/kOmegaSSTSAS/kOmegaSSTSAS.C           | 492 --------------
 .../LES/kOmegaSSTSAS/kOmegaSSTSAS.H           | 292 ---------
 .../incompressible/LES/laminar/laminar.C      | 183 ------
 .../incompressible/LES/laminar/laminar.H      | 138 ----
 .../LES/mixedSmagorinsky/mixedSmagorinsky.C   | 160 -----
 .../LES/mixedSmagorinsky/mixedSmagorinsky.H   | 167 -----
 .../incompressible/LES/oneEqEddy/oneEqEddy.C  | 146 -----
 .../incompressible/LES/oneEqEddy/oneEqEddy.H  | 154 -----
 .../LES/scaleSimilarity/scaleSimilarity.C     | 129 ----
 .../LES/scaleSimilarity/scaleSimilarity.H     | 146 -----
 .../LES/spectEddyVisc/spectEddyVisc.C         | 174 -----
 .../LES/spectEddyVisc/spectEddyVisc.H         | 144 -----
 .../incompressible/RAS/LRR/LRR.C              | 475 --------------
 .../incompressible/RAS/LRR/LRR.H              | 204 ------
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 527 ---------------
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 216 -------
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     | 309 ---------
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     | 195 ------
 .../incompressible/RAS/Make/files             |  66 --
 .../incompressible/RAS/Make/options           |  11 -
 .../incompressible/RAS/RASModel/RASModel.C    | 206 ------
 .../incompressible/RAS/RASModel/RASModel.H    | 243 -------
 .../incompressible/RAS/RASModel/RASModelDoc.H |  32 -
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     | 469 --------------
 .../backwardsCompatibilityWallFunctions.C     | 286 ---------
 .../backwardsCompatibilityWallFunctions.H     | 122 ----
 ...wardsCompatibilityWallFunctionsTemplates.C | 169 -----
 ...ndaryLayerInletEpsilonFvPatchScalarField.C | 142 -----
 ...ndaryLayerInletEpsilonFvPatchScalarField.H | 177 -----
 .../incompressibleRASBoundaryConditionsDoc.H  |  39 --
 ...thDissipationRateInletFvPatchScalarField.C | 179 ------
 ...thDissipationRateInletFvPatchScalarField.H | 203 ------
 ...ngLengthFrequencyInletFvPatchScalarField.C | 176 -----
 ...ngLengthFrequencyInletFvPatchScalarField.H | 203 ------
 ...silonLowReWallFunctionFvPatchScalarField.C | 193 ------
 ...silonLowReWallFunctionFvPatchScalarField.H | 194 ------
 .../epsilonWallFunctionFvPatchScalarField.C   | 586 -----------------
 .../epsilonWallFunctionFvPatchScalarField.H   | 291 ---------
 .../kLowReWallFunctionFvPatchScalarField.C    | 252 --------
 .../kLowReWallFunctionFvPatchScalarField.H    | 207 ------
 .../kqRWallFunctionFvPatchField.C             | 150 -----
 .../kqRWallFunctionFvPatchField.H             | 185 ------
 .../kqRWallFunctionFvPatchFields.C            |  47 --
 .../kqRWallFunctionFvPatchFields.H            |  52 --
 .../nutLowReWallFunctionFvPatchScalarField.C  | 131 ----
 .../nutLowReWallFunctionFvPatchScalarField.H  | 166 -----
 .../nutURoughWallFunctionFvPatchScalarField.C | 313 ---------
 .../nutURoughWallFunctionFvPatchScalarField.H | 241 -------
 ...tUSpaldingWallFunctionFvPatchScalarField.C | 220 -------
 ...tUSpaldingWallFunctionFvPatchScalarField.H | 190 ------
 ...UTabulatedWallFunctionFvPatchScalarField.C | 218 -------
 ...UTabulatedWallFunctionFvPatchScalarField.H | 198 ------
 .../nutUWallFunctionFvPatchScalarField.C      | 202 ------
 .../nutUWallFunctionFvPatchScalarField.H      | 176 -----
 .../nutWallFunctionFvPatchScalarField.C       | 197 ------
 .../nutWallFunctionFvPatchScalarField.H       | 181 ------
 ...tkAtmRoughWallFunctionFvPatchScalarField.C | 197 ------
 ...tkAtmRoughWallFunctionFvPatchScalarField.H | 217 -------
 .../nutkRoughWallFunctionFvPatchScalarField.C | 241 -------
 .../nutkRoughWallFunctionFvPatchScalarField.H | 221 -------
 .../nutkWallFunctionFvPatchScalarField.C      | 164 -----
 .../nutkWallFunctionFvPatchScalarField.H      | 166 -----
 .../omegaWallFunctionFvPatchScalarField.C     | 601 -----------------
 .../omegaWallFunctionFvPatchScalarField.H     | 298 ---------
 .../incompressible/RAS/kEpsilon/kEpsilon.C    | 290 ---------
 .../incompressible/RAS/kEpsilon/kEpsilon.H    | 197 ------
 .../incompressible/RAS/kOmegaSST/kOmegaSST.C  | 472 --------------
 .../incompressible/RAS/kOmegaSST/kOmegaSST.H  | 311 ---------
 .../incompressible/RAS/laminar/laminar.C      | 214 -------
 .../RAS/realizableKE/realizableKE.C           | 356 -----------
 .../RAS/realizableKE/realizableKE.H           | 211 ------
 .../incompressible/turbulenceModel/Make/files |   7 -
 .../turbulenceModel/Make/options              |   8 -
 ...daryLayerInletVelocityFvPatchVectorField.C | 142 -----
 ...daryLayerInletVelocityFvPatchVectorField.H | 178 ------
 ...entHeatFluxTemperatureFvPatchScalarField.C | 256 --------
 ...entHeatFluxTemperatureFvPatchScalarField.H | 228 -------
 .../turbulenceModel/laminar/laminar.C         | 245 -------
 .../turbulenceModel/turbulenceModel.C         | 143 -----
 .../turbulenceModel/turbulenceModel.H         | 246 -------
 .../ras/counterFlowFlame2D/system/fvSchemes   |   2 +-
 .../0.org/epsilon                             |   6 +-
 .../flamePropagationWithObstacles/0.org/k     |   6 +-
 .../flamePropagationWithObstacles/0.org/k.old |   6 +-
 .../0.org/{mut => nut}                        |  10 +-
 .../constant/RASProperties                    |  36 --
 .../constant/turbulenceProperties             |  23 +-
 .../system/changeDictionaryDict               |   8 +-
 .../system/fvSchemes                          |   2 +-
 .../ras/moriyoshiHomogeneous/0/{mut => nut}   |   4 +-
 .../constant/turbulenceProperties             |  11 +-
 .../ras/moriyoshiHomogeneous/system/fvSchemes |   2 +-
 .../engineFoam/kivaTest/-180/epsilon          |   6 +-
 .../combustion/engineFoam/kivaTest/-180/k     |   6 +-
 .../engineFoam/kivaTest/-180/{mut => nut}     |  10 +-
 .../kivaTest/constant/polyMesh/boundary       |   3 +
 .../kivaTest/constant/turbulenceProperties    |  11 +-
 .../engineFoam/kivaTest/system/fvSchemes      |   2 +-
 .../0/{alphaSgs => alphat}                    |   2 +-
 .../0/{muSgs => nut}                          |   8 +-
 .../constant/LESProperties                    |  93 ---
 .../constant/turbulenceProperties             |  81 ++-
 .../system/fvSchemes                          |   2 +-
 .../0/{alphaSgs => alphat}                    |   4 +-
 .../oppositeBurningPanels/0/{muSgs => nut}    |   6 +-
 .../fireFoam/les/oppositeBurningPanels/Allrun |   6 +-
 .../constant/LESProperties                    |  93 ---
 .../constant/turbulenceProperties             |  80 ++-
 .../oppositeBurningPanels/system/fvSchemes    |   2 +-
 .../les/smallPoolFire2D/0/{muSgs => alphat}   |   2 +-
 .../les/smallPoolFire2D/0/{alphaSgs => nut}   |   4 +-
 .../smallPoolFire2D/constant/LESProperties    |  82 ---
 .../constant/turbulenceProperties             |  71 ++-
 .../les/smallPoolFire2D/system/fvSchemes      |   2 +-
 .../les/smallPoolFire3D/0/{muSgs => alphat}   |   3 +-
 .../les/smallPoolFire3D/0/{alphaSgs => nut}   |   5 +-
 .../smallPoolFire3D/constant/LESProperties    |  88 ---
 .../constant/turbulenceProperties             |  74 ++-
 .../les/smallPoolFire3D/system/fvSchemes      |   2 +-
 .../ras/counterFlowFlame2D/system/fvSchemes   |   2 +-
 .../rhoLTSPimpleFoam/angledDuct/0/epsilon     |  10 +-
 .../rhoLTSPimpleFoam/angledDuct/0/k           |   8 +-
 .../angledDuct/0/{mut => nut}                 |  12 +-
 .../angledDuct/constant/turbulenceProperties  |  11 +-
 .../angledDuct/system/fvSchemes               |   2 +-
 .../annularThermalMixer/0.org/{mut => nut}    |  10 +-
 .../constant/boundaryConditions               |  10 +-
 .../constant/turbulenceProperties             |  12 +-
 .../annularThermalMixer/system/fvSchemes      |   2 +-
 .../les/pitzDaily/0/{alphaSgs => alphat}      |   0
 .../rhoPimpleFoam/les/pitzDaily/0/nut}        |   2 +-
 .../les/pitzDaily/constant/LESProperties      |  88 ---
 .../les/pitzDaily/constant/polyMesh/boundary  |   2 +
 .../pitzDaily/constant/turbulenceProperties   |  74 ++-
 .../les/pitzDaily/system/fvSchemes            |   2 +-
 .../rhoPimpleFoam/ras/angledDuct/0/epsilon    |  10 +-
 .../rhoPimpleFoam/ras/angledDuct/0/k          |   8 +-
 .../ras/angledDuct/0/{mut => nut}             |  12 +-
 .../angledDuct/constant/turbulenceProperties  |  11 +-
 .../ras/angledDuct/system/fvSchemes           |   2 +-
 .../rhoPimpleFoam/ras/cavity/0/epsilon        |   4 +-
 .../compressible/rhoPimpleFoam/ras/cavity/0/k |   4 +-
 .../rhoPimpleFoam/ras/cavity/0/{mut => nut}   |   6 +-
 .../rhoPimpleFoam/ras/cavity/0/omega          |   4 +-
 .../ras/cavity/constant/turbulenceProperties  |  11 +-
 .../rhoPimpleFoam/ras/cavity/system/fvSchemes |   2 +-
 .../rhoPimpleFoam/ras/mixerVessel2D/0/epsilon |   4 +-
 .../rhoPimpleFoam/ras/mixerVessel2D/0/k       |   4 +-
 .../ras/mixerVessel2D/0/{mut => nut}          |   8 +-
 .../ras/mixerVessel2D/constant/RASProperties  |  25 -
 .../constant/turbulenceProperties             |  11 +-
 .../ras/mixerVessel2D/system/fvSchemes        |   2 +-
 .../rhoPimplecFoam/angledDuct/0/alphat        |  14 +-
 .../rhoPimplecFoam/angledDuct/0/epsilon       |  10 +-
 .../rhoPimplecFoam/angledDuct/0/k             |   8 +-
 .../rhoPimplecFoam/angledDuct/0/{mut => nut}  |  12 +-
 .../angledDuct/constant/RASProperties         |  25 -
 .../angledDuct/constant/turbulenceProperties  |  11 +-
 .../angledDuct/system/fvSchemes               |   2 +-
 .../angledDuctExplicit/system/fvSchemes       |   2 +-
 .../angledDuctImplicit/0/epsilon              |  10 +-
 .../angledDuctImplicit/0/k                    |   8 +-
 .../angledDuctImplicit/0/nut}                 |  12 +-
 .../angledDuctImplicit/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../angledDuctImplicit/system/fvSchemes       |   2 +-
 .../angledDuctExplicitFixedCoeff/0/epsilon    |  10 +-
 .../angledDuctExplicitFixedCoeff/0/k          |   8 +-
 .../angledDuctExplicitFixedCoeff/0/nut}       |  12 +-
 .../constant/RASProperties                    |  25 -
 .../constant/polyMesh/boundary                |   4 +
 .../constant/turbulenceProperties             |  28 +
 .../system/fvSchemes                          |   2 +-
 .../rhoSimplecFoam/squareBend/0/epsilon       |   4 +-
 .../rhoSimplecFoam/squareBend/0/k             |   2 +-
 .../rhoSimplecFoam/squareBend/0/{mut => nut}  |   6 +-
 .../squareBend/constant/RASProperties         |  25 -
 .../squareBend/constant/turbulenceProperties  |  11 +-
 .../squareBend/system/fvSchemes               |   2 +-
 .../laminar/forwardStep/system/fvSchemes      |   2 +-
 .../laminar/shockTube/system/fvSchemes        |   2 +-
 .../sonicFoam/ras/nacaAirfoil/0/epsilon       |   2 +-
 .../sonicFoam/ras/nacaAirfoil/0/k             |   2 +-
 .../sonicFoam/ras/nacaAirfoil/0/{mut => nut}  |   6 +-
 .../ras/nacaAirfoil/constant/RASProperties    |  25 -
 .../nacaAirfoil/constant/polyMesh/boundary    |   1 +
 .../nacaAirfoil/constant/turbulenceProperties |  11 +-
 .../ras/nacaAirfoil/system/fvSchemes          |   2 +-
 .../sonicFoam/ras/prism/0/epsilon             |   2 +-
 .../compressible/sonicFoam/ras/prism/0/k      |   2 +-
 .../sonicFoam/ras/prism/0/{mut => nut}        |   6 +-
 .../ras/prism/constant/RASProperties          |  25 -
 .../ras/prism/constant/turbulenceProperties   |  11 +-
 .../sonicFoam/ras/prism/system/fvSchemes      |   2 +-
 .../hotRoom/constant/RASProperties            |  25 -
 .../hotRoom/constant/turbulenceProperties     |  28 +
 .../hotRoom/system/fvSchemes                  |   2 +-
 .../hotRoom/constant/RASProperties            |  25 -
 .../hotRoom/constant/turbulenceProperties     |  28 +
 .../hotRoom/system/fvSchemes                  |   2 +-
 .../iglooWithFridges/constant/RASProperties   |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../iglooWithFridges/system/controlDict       |   7 -
 .../iglooWithFridges/system/fvSchemes         |   2 +-
 .../buoyantPimpleFoam/hotRoom/0/epsilon       |   6 +-
 .../buoyantPimpleFoam/hotRoom/0/k             |   6 +-
 .../buoyantPimpleFoam/hotRoom/0/{mut => nut}  |  10 +-
 .../hotRoom/constant/RASProperties            |  25 -
 .../hotRoom/constant/turbulenceProperties     |  11 +-
 .../hotRoom/system/fvSchemes                  |   2 +-
 .../buoyantSimpleFoam/buoyantCavity/0/epsilon |   8 +-
 .../buoyantSimpleFoam/buoyantCavity/0/k       |   8 +-
 .../0/mut => buoyantCavity/0/nut}             |  12 +-
 .../buoyantSimpleFoam/buoyantCavity/0/omega   |   8 +-
 .../buoyantCavity/constant/RASProperties      |  23 -
 .../constant/turbulenceProperties}            |  10 +-
 .../buoyantCavity/system/fvSchemes            |   2 +-
 .../circuitBoardCooling/0.org/epsilon         |   4 +-
 .../0.org/include/wallBafflePatches           |   8 +-
 .../circuitBoardCooling/0.org/k               |   4 +-
 .../circuitBoardCooling/0.org/{mut => nut}    |   8 +-
 .../constant/RASProperties                    |  23 -
 .../constant/turbulenceProperties}            |  10 +-
 .../circuitBoardCooling/system/controlDict    |   2 +-
 .../circuitBoardCooling/system/fvSchemes      |  10 +-
 .../externalCoupledCavity/0/epsilon           |   8 +-
 .../externalCoupledCavity/0/k                 |   8 +-
 .../0/mut => externalCoupledCavity/0/nut}     |  12 +-
 .../externalCoupledCavity/0/omega             |   8 +-
 .../constant/RASProperties                    |  23 -
 .../constant/turbulenceProperties             |  27 +
 .../externalCoupledCavity/system/fvSchemes    |   2 +-
 .../hotRadiationRoom/0/epsilon                |   8 +-
 .../buoyantSimpleFoam/hotRadiationRoom/0/k    |   8 +-
 .../hotRadiationRoom/0/{mut => nut}           |  12 +-
 .../hotRadiationRoom/constant/RASProperties   |  25 -
 .../constant/turbulenceProperties}            |   9 +-
 .../hotRadiationRoom/system/fvSchemes         |   2 +-
 .../hotRadiationRoomFvDOM/0/epsilon           |   8 +-
 .../hotRadiationRoomFvDOM/0/k                 |   8 +-
 .../hotRadiationRoomFvDOM/0/{mut => nut}      |  12 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties}            |   9 +-
 .../hotRadiationRoomFvDOM/system/fvSchemes    |   2 +-
 .../multiRegionHeater/0/bottomWater/epsilon   |  12 +-
 .../multiRegionHeater/0/bottomWater/k         |  12 +-
 .../multiRegionHeater/Allrun                  |   2 +-
 .../system/bottomWater/changeDictionaryDict   |   4 +-
 .../system/bottomWater/fvSchemes              |   2 +-
 .../multiRegionHeater/system/controlDict      |   6 -
 .../system/topAir/changeDictionaryDict        |   4 +-
 .../snappyMultiRegionHeater/Allrun            |   2 +-
 .../constant/bottomAir/RASProperties          |  24 -
 .../constant/topAir/RASProperties             |   1 -
 .../system/bottomAir/changeDictionaryDict     |   4 +-
 .../system/bottomAir/fvSchemes                |   2 +-
 .../system/topAir/changeDictionaryDict        |   4 +-
 .../heatExchanger/0.org/air/alphat            |  47 ++
 .../heatExchanger/0.org/air/epsilon           |   4 +-
 .../heatExchanger/0.org/air/k                 |   4 +-
 .../heatExchanger/0.org/air/nut               |  47 ++
 .../heatExchanger/constant/air/RASProperties  |  25 -
 .../constant/air/turbulenceProperties         |  11 +-
 .../constant/porous/RASProperties             |  24 -
 .../heatExchanger/system/air/fvSchemes        |   2 +-
 .../heatExchanger/system/porous/fvSchemes     |   2 +-
 .../multiRegionHeaterRadiation/Allrun.pre     |   2 +-
 .../constant/bottomAir/RASProperties          |  24 -
 .../constant/topAir/RASProperties             |   1 -
 .../system/bottomAir/changeDictionaryDict     |   4 +-
 .../system/bottomAir/fvSchemes                |   2 +-
 .../system/topAir/changeDictionaryDict        |   4 +-
 .../rotor2D/constant/RASProperties            |  25 -
 .../rotor2D/constant/polyMesh/boundary        |   3 +
 .../rotor2D/constant/turbulenceProperties     |  12 +-
 .../SRFPimpleFoam/rotor2D/system/fvSchemes    |   2 +-
 .../mixer/constant/RASProperties              |  25 -
 .../mixer/constant/turbulenceProperties       |  28 +
 .../SRFSimpleFoam/mixer/system/fvSchemes      |   2 +-
 .../SRFSimpleFoam/mixer/turbulenceProperties  |  28 +
 .../pitzDaily/constant/RASProperties          |  24 -
 .../pitzDaily/constant/turbulenceProperties}  |   9 +-
 .../pitzDaily/system/fvSchemes                |   4 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../boundaryLaunderSharma/system/fvSchemes    |   2 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../boundaryWallFunctions/system/fvSchemes    |   2 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../system/fvSchemes                          |   2 +-
 .../mixerVesselAMI2D/constant/RASProperties   |  25 -
 .../mixerVesselAMI2D/system/fvSchemes         |   2 +-
 .../pimpleDyMFoam/movingCone/system/fvSchemes |   2 +-
 .../oscillatingInletACMI2D/0.org/nut}         |  36 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  11 +-
 .../oscillatingInletACMI2D/system/fvSchemes   |   2 +-
 .../propeller/constant/RASProperties          |  25 -
 .../propeller/constant/turbulenceProperties   |  11 +-
 .../propeller/system/controlDict              |   6 -
 .../pimpleDyMFoam/propeller/system/fvSchemes  |   2 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  11 +-
 .../system/fvSchemes                          |   2 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  27 +
 .../wingMotion2D_simpleFoam/system/fvSchemes  |   2 +-
 .../wingMotion_snappyHexMesh/system/fvSchemes |   2 +-
 .../TJunction/constant/RASProperties          |  25 -
 .../TJunction/constant/turbulenceProperties   |  12 +-
 .../pimpleFoam/TJunction/system/controlDict   |   7 -
 .../pimpleFoam/TJunction/system/fvSchemes     |   2 +-
 .../TJunctionFan/constant/RASProperties       |  25 -
 .../constant/turbulenceProperties             |  12 +-
 .../TJunctionFan/system/controlDict           |   6 -
 .../pimpleFoam/TJunctionFan/system/fvSchemes  |   2 +-
 .../channel395/0.org/{nuSgs => nut}           |   2 +-
 .../pimpleFoam/channel395/0/nuSgs.gz          | Bin 208201 -> 0 bytes
 .../pimpleFoam/channel395/Allrun              |   2 +-
 .../channel395/constant/LESProperties         |  86 ---
 .../channel395/constant/turbulenceProperties  |  75 ++-
 .../channel395/system/decomposeParDict        |  10 +-
 .../pimpleFoam/channel395/system/fvSchemes    |   7 +-
 .../pimpleFoam/channel395/system/fvSolution   |   4 +-
 .../elipsekkLOmega/constant/RASProperties     |  25 -
 .../constant/turbulenceProperties             |  12 +-
 .../elipsekkLOmega/system/fvSchemes           |   2 +-
 .../pitzDaily/constant/RASProperties          |  25 -
 .../pitzDaily/constant/polyMesh/boundary      |   2 +
 .../pitzDaily/constant/turbulenceProperties   |  11 +-
 .../pimpleFoam/pitzDaily/system/fvSchemes     |   2 +-
 .../pisoFoam/les/motorBike/lesFiles/Allrun    |   8 +-
 .../les/motorBike/lesFiles/LESProperties      |  79 ---
 .../pisoFoam/les/motorBike/lesFiles/fvSchemes |   3 +-
 .../les/motorBike/lesFiles/fvSolution         |  13 +-
 .../pisoFoam/les/motorBike/lesFiles/nuSgs     |  69 --
 .../motorBike/lesFiles/turbulenceProperties   |  68 +-
 .../motorBike/constant/RASProperties          |  25 -
 .../motorBike/constant/polyMesh/boundary      | 428 +------------
 .../motorBike/constant/turbulenceProperties}  |   9 +-
 .../les/motorBike/motorBike/system/fvSchemes  |   2 +-
 .../pisoFoam/les/pitzDaily/0/{nuSgs => nut}   |   2 +-
 .../les/pitzDaily/constant/LESProperties      |  86 ---
 .../pitzDaily/constant/turbulenceProperties   |  74 ++-
 .../pisoFoam/les/pitzDaily/system/fvSchemes   |   2 +-
 .../pisoFoam/les/pitzDailyMapped/0/nut}       |   4 +-
 .../pitzDailyMapped/constant/LESProperties    |  86 ---
 .../constant/turbulenceProperties             |  73 ++-
 .../les/pitzDailyMapped/system/fvSchemes      |   2 +-
 .../pisoFoam/ras/cavity/0/omega               |  41 ++
 .../ras/cavity/constant/RASProperties         |  25 -
 .../ras/cavity/constant/turbulenceProperties  |  10 +-
 .../pisoFoam/ras/cavity/system/fvSchemes      |   3 +-
 .../pisoFoam/ras/cavity/system/fvSolution     |   2 +-
 .../ras/cavityCoupledU/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |  10 +-
 .../ras/cavityCoupledU/system/fvSchemes       |   2 +-
 .../angledDuctExplicit/system/fvSchemes       |   2 +-
 .../angledDuctImplicit/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../angledDuctImplicit/system/fvSchemes       |   2 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |  28 +
 .../straightDuctImplicit/system/fvSchemes     |   2 +-
 .../airFoil2D/constant/RASProperties          |  25 -
 .../airFoil2D/constant/turbulenceProperties   |  27 +
 .../simpleFoam/airFoil2D/system/fvSchemes     |   2 +-
 .../mixerVessel2D/constant/RASProperties      |  25 -
 .../constant/turbulenceProperties             |  27 +
 .../simpleFoam/mixerVessel2D/system/fvSchemes |   2 +-
 .../motorBike/constant/RASProperties          |  24 -
 .../motorBike/constant/turbulenceProperties   |  26 +
 .../simpleFoam/motorBike/system/controlDict   |   7 -
 .../simpleFoam/motorBike/system/fvSchemes     |   2 +-
 .../pipeCyclic/constant/RASProperties         |  25 -
 .../pipeCyclic/constant/turbulenceProperties  |  10 +-
 .../simpleFoam/pipeCyclic/system/controlDict  |   7 -
 .../simpleFoam/pipeCyclic/system/fvSchemes    |   2 +-
 .../pitzDaily/constant/RASProperties          |  25 -
 .../pitzDaily/constant/turbulenceProperties   |  28 +
 .../simpleFoam/pitzDaily/system/fvSchemes     |   2 +-
 .../pitzDailyExptInlet/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |  27 +
 .../pitzDailyExptInlet/system/fvSchemes       |   2 +-
 .../{RASProperties => turbulenceProperties}   |  37 +-
 .../turbineSiting/system/controlDict          |   4 +-
 .../simpleFoam/turbineSiting/system/fvSchemes |   4 +-
 .../counterFlowFlame2D/0/{mut => nut}         |   4 +-
 .../counterFlowFlame2D/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |   1 -
 .../counterFlowFlame2D/system/fvSchemes       |   2 +-
 .../verticalChannel/0.org/k                   |   2 +-
 .../verticalChannel/0.org/nut}                |   6 +-
 .../verticalChannel/0.org/omega               |   6 +-
 .../LTSReactingParcelFoam/verticalChannel/0/k |   2 +-
 .../verticalChannel/{0.org/mut => 0/nut}      |   6 +-
 .../verticalChannel/0/omega                   |   6 +-
 .../verticalChannel/constant/RASProperties    |  24 -
 .../constant/turbulenceProperties             |  11 +-
 .../verticalChannel/system/fvSchemes          |   2 +-
 .../MPPICFoam/column/constant/RASProperties   |  25 -
 .../simplifiedSiwek/0/epsilon                 |   6 +-
 .../coalChemistryFoam/simplifiedSiwek/0/k     |   6 +-
 .../simplifiedSiwek/0/{mut => nut}            |  10 +-
 .../simplifiedSiwek/constant/RASProperties    |  24 -
 .../constant/turbulenceProperties             |  11 +-
 .../simplifiedSiwek/system/fvSchemes          |   2 +-
 .../hopperEmptying/constant/RASProperties     |  25 -
 .../constant/turbulenceProperties             |   2 +-
 .../hopperInitialState/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |   2 +-
 .../cylinder/system/fvSchemes                 |   2 +-
 .../hotBoxes/0.org/epsilon                    |   4 +-
 .../reactingParcelFilmFoam/hotBoxes/0.org/k   |   4 +-
 .../hotBoxes/0.org/{mut => nut}               |   8 +-
 .../hotBoxes/constant/RASProperties           |  25 -
 .../hotBoxes/constant/turbulenceProperties    |  11 +-
 .../hotBoxes/system/changeDictionaryDict      |   2 +-
 .../hotBoxes/system/fvSchemes                 |   2 +-
 .../rivuletPanel/system/fvSchemes             |   2 +-
 .../splashPanel/system/fvSchemes              |   2 +-
 .../reactingParcelFoam/filter/0.org/epsilon   |   2 +-
 .../reactingParcelFoam/filter/0.org/k         |   2 +-
 .../filter/0.org/{mut => nut}                 |   6 +-
 .../reactingParcelFoam/filter/0/epsilon       |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/k  |   2 +-
 .../reactingParcelFoam/filter/0/{mut => nut}  |   6 +-
 .../filter/constant/RASProperties             |  24 -
 .../filter/constant/turbulenceProperties      |  11 +-
 .../filter/system/changeDictionaryDict        |   2 +-
 .../filter/system/controlDict                 |   7 -
 .../filter/system/fvSchemes                   |   2 +-
 .../parcelInBox/system/fvSchemes              |   2 +-
 .../verticalChannel/0.org/k                   |   2 +-
 .../verticalChannel/0.org/nut}                |   6 +-
 .../verticalChannel/0.org/omega               |   6 +-
 .../verticalChannel/constant/RASProperties    |  24 -
 .../constant/turbulenceProperties             |  11 +-
 .../verticalChannel/system/fvSchemes          |   2 +-
 .../verticalChannel/0.org/k                   |   2 +-
 .../verticalChannel/0.org/nut}                |   6 +-
 .../verticalChannel/0.org/omega               |   6 +-
 .../verticalChannel/0/k                       |   2 +-
 .../verticalChannel/0/mut                     |  58 --
 .../verticalChannel/0/nut                     |  58 ++
 .../verticalChannel/0/omega                   |   6 +-
 .../verticalChannel/constant/RASProperties    |  24 -
 .../constant/turbulenceProperties             |  11 +-
 .../verticalChannel/system/fvSchemes          |   2 +-
 .../lagrangian/sprayFoam/aachenBomb/0/epsilon |   2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0/k |   2 +-
 .../sprayFoam/aachenBomb/0/{mut => nut}       |   6 +-
 .../aachenBomb/constant/RASProperties         |  25 -
 .../aachenBomb/constant/turbulenceProperties  |  11 +-
 .../sprayFoam/aachenBomb/system/fvSchemes     |   2 +-
 .../mixerVessel/constant/RASProperties        |  25 -
 .../mixerVessel/constant/turbulenceProperties |  12 +-
 .../foamyHexMesh/mixerVessel/system/fvSchemes |   2 +-
 .../DTCHull/constant/RASProperties            |  25 -
 .../DTCHull/constant/turbulenceProperties     |  11 +-
 .../LTSInterFoam/DTCHull/system/fvSchemes     |   2 +-
 .../les/throttle/0/{nuSgs => nut}             |   2 +-
 .../les/throttle/constant/LESProperties       |  84 ---
 .../throttle/constant/turbulenceProperties    |  74 ++-
 .../les/throttle/system/fvSchemes             |   2 +-
 .../les/throttle3D/0.org/{nuSgs => nut}       |   2 +-
 .../les/throttle3D/constant/LESProperties     |  84 ---
 .../throttle3D/constant/turbulenceProperties  |  74 ++-
 .../les/throttle3D/system/fvSchemes           |   2 +-
 .../ras/throttle/constant/RASProperties       |  25 -
 .../throttle/constant/turbulenceProperties    |  11 +-
 .../ras/throttle/system/fvSchemes             |   2 +-
 .../ras/sloshingTank2D/constant/RASProperties |  25 -
 .../ras/sloshingTank2D/system/fvSchemes       |   2 +-
 .../depthCharge2D/constant/LESProperties      |  84 ---
 .../depthCharge2D/constant/polyMesh/boundary  |   1 +
 .../laminar/depthCharge2D/system/fvSchemes    |   2 +-
 .../depthCharge3D/constant/LESProperties      |  84 ---
 .../laminar/depthCharge3D/system/fvSchemes    |   2 +-
 .../laminar/damBreak4phase/system/fvSchemes   |   2 +-
 .../ras/DTCHull/constant/RASProperties        |  25 -
 .../ras/DTCHull/constant/turbulenceProperties |  11 +-
 .../interDyMFoam/ras/DTCHull/system/fvSchemes |   2 +-
 .../constant/RASProperties                    |  25 -
 .../constant/turbulenceProperties             |   2 +-
 .../ras/damBreakWithObstacle/system/fvSchemes |   2 +-
 .../ras/floatingObject/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |  12 +-
 .../ras/floatingObject/system/fvSchemes       |   2 +-
 .../ras/mixerVesselAMI/constant/RASProperties |  25 -
 .../constant/turbulenceProperties             |  12 +-
 .../ras/mixerVesselAMI/system/fvSchemes       |   4 +-
 .../ras/sloshingTank2D/constant/RASProperties |  25 -
 .../ras/sloshingTank2D/system/fvSchemes       |   2 +-
 .../sloshingTank2D3DoF/constant/RASProperties |  25 -
 .../ras/sloshingTank2D3DoF/system/fvSchemes   |   2 +-
 .../ras/sloshingTank3D/constant/RASProperties |  25 -
 .../ras/sloshingTank3D/system/fvSchemes       |   2 +-
 .../ras/sloshingTank3D3DoF/system/fvSchemes   |   2 +-
 .../sloshingTank3D6DoF/constant/RASProperties |  25 -
 .../ras/sloshingTank3D6DoF/system/fvSchemes   |   2 +-
 .../ras/testTubeMixer/constant/RASProperties  |  25 -
 .../ras/testTubeMixer/system/fvSchemes        |   2 +-
 .../laminar/capillaryRise/system/fvSchemes    |   2 +-
 .../laminar/damBreak/system/fvSchemes         |   2 +-
 .../laminar/mixerVessel2D/system/fvSchemes    |   2 +-
 .../les/nozzleFlow2D/0/{nuSgs => nut}         |   2 +-
 .../les/nozzleFlow2D/constant/LESProperties   |  86 ---
 .../constant/turbulenceProperties             |  73 ++-
 .../les/nozzleFlow2D/system/fvSchemes         |   2 +-
 tutorials/multiphase/interFoam/ras/Allclean   |   2 +-
 .../ras/angledDuct/constant/RASProperties     |  25 -
 .../angledDuct/constant/turbulenceProperties  |  11 +-
 .../interFoam/ras/angledDuct/system/fvSchemes |   2 +-
 .../ras/damBreak/constant/RASProperties       |  25 -
 .../ras/damBreak/constant/polyMesh/boundary   |   3 +
 .../damBreak/constant/turbulenceProperties    |  11 +-
 .../interFoam/ras/damBreak/system/fvSchemes   |   2 +-
 .../ras/damBreakPorousBaffle/0/p_rgh          |   4 +-
 .../constant/RASProperties                    |  25 -
 .../constant/polyMesh/boundary                |  19 +-
 .../constant/turbulenceProperties             |  11 +-
 .../damBreakPorousBaffle/system/controlDict   |   6 -
 .../ras/damBreakPorousBaffle/system/fvSchemes |   2 +-
 .../LTSInterFoam/system/fvSchemes             |   2 +-
 .../ras/waterChannel/constant/RASProperties   |  24 -
 .../constant/turbulenceProperties             |  11 +-
 .../ras/waterChannel/system/fvSchemes         |   2 +-
 .../ras/weirOverflow/constant/RASProperties   |  25 -
 .../constant/turbulenceProperties             |  11 +-
 .../ras/weirOverflow/system/fvSchemes         |   2 +-
 .../laminar/damBreak/system/fvSchemes         |   2 +-
 .../propeller/constant/RASProperties          |  25 -
 .../propeller/constant/turbulenceProperties   |  11 +-
 .../propeller/system/controlDict              |   6 -
 .../propeller/system/fvSchemes                |   2 +-
 .../cavitatingBullet/system/fvSchemes         |   2 +-
 .../bubbleColumn/constant/LESProperties       |  29 -
 .../bubbleColumn/constant/polyMesh/boundary   |   1 +
 .../constant/turbulenceProperties}            |   6 +-
 .../damBreak4phase/constant/LESProperties     |  29 -
 .../damBreak4phase/constant/polyMesh/boundary |   3 +
 .../damBreak4phaseFine/constant/LESProperties |  29 -
 .../constant/polyMesh/boundary                |   3 +
 .../mixerVessel2D/constant/LESProperties      |  29 -
 .../mixerVessel2D/constant/polyMesh/boundary  |   2 +
 .../constant/turbulenceProperties}            |   9 +-
 .../mixerVesselAMI2D/constant/RASProperties   |  25 -
 .../laminar/mixerVesselAMI2D/system/fvSchemes |   2 +-
 .../laminar/damBreak4phase/system/fvSchemes   |   2 +-
 .../damBreak4phaseFine/system/fvSchemes       |   2 +-
 .../laminar/mixerVessel2D/system/fvSchemes    |   2 +-
 .../oscillatingBox/system/fvSchemes           |   2 +-
 .../oscillatingBox/system/fvSchemes           |   2 +-
 .../lockExchange/system/fvSchemes             |   2 +-
 1102 files changed, 9087 insertions(+), 54729 deletions(-)
 delete mode 100644 applications/test/PisoFoam/Make/files
 delete mode 100644 applications/test/PisoFoam/Make/options
 delete mode 100644 applications/test/PisoFoam/PisoFoam.C
 delete mode 100644 applications/test/PisoFoam/turbulenceModel.H
 delete mode 100644 applications/test/RhoPimpleFoam/EEqn.H
 delete mode 100644 applications/test/RhoPimpleFoam/Make/files
 delete mode 100644 applications/test/RhoPimpleFoam/Make/options
 delete mode 100644 applications/test/RhoPimpleFoam/rhoPimpleFoam.C
 delete mode 100644 applications/test/RhoPimpleFoam/turbulenceModel.H
 delete mode 100644 applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files
 delete mode 100644 applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
 delete mode 100644 applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
 create mode 100644 src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C
 rename src/{turbulenceModels/compressible/LES/DESModel/DESModel.H => TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H} (56%)
 create mode 100644 src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
 create mode 100644 src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
 create mode 100644 src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
 create mode 100644 src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible}/turbulenceModelDoc.H (94%)
 rename src/{turbulenceModels/compressible/RAS => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C (87%)
 rename src/{turbulenceModels/compressible/RAS => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H (98%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C (95%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C (95%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H (98%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C (98%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C (97%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H (96%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C (91%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H (98%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H (98%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C (99%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H (99%)
 rename src/{turbulenceModels/compressible/RAS => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C (92%)
 rename src/{turbulenceModels/compressible/RAS => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H (98%)
 rename src/{turbulenceModels/compressible/RAS => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C (82%)
 rename src/{turbulenceModels/compressible/RAS => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H (94%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C (94%)
 rename src/{turbulenceModels/compressible/turbulenceModel => TurbulenceModels/compressible/turbulentFluidThermoModels}/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H (98%)
 create mode 100644 src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
 rename src/{turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H => TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H} (57%)
 rename src/TurbulenceModels/compressible/{compressibleTurbulenceModels.C => turbulentFluidThermoModels/turbulentFluidThermoModels.C} (78%)
 create mode 100644 src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C
 rename src/{turbulenceModels/incompressible/LES/DESModel/DESModel.H => TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H} (56%)
 rename src/{turbulenceModels/incompressible/turbulenceModel => TurbulenceModels/incompressible}/turbulenceModelDoc.H (94%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LamBremhorstKE/LamBremhorstKE.C (72%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LamBremhorstKE/LamBremhorstKE.H (81%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienCubicKE/LienCubicKE.C (67%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienCubicKE/LienCubicKE.H (81%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienCubicKELowRe/LienCubicKELowRe.C (69%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienCubicKELowRe/LienCubicKELowRe.H (84%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H (100%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C (72%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H (82%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H (100%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/RNGkEpsilon/RNGkEpsilon.C (71%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/RNGkEpsilon/RNGkEpsilon.H (83%)
 rename src/{turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions => TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions}/fWallFunction/fWallFunctionFvPatchScalarField.C (92%)
 rename src/{turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions => TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions}/fWallFunction/fWallFunctionFvPatchScalarField.H (97%)
 rename src/{turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions => TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions}/v2WallFunction/v2WallFunctionFvPatchScalarField.C (92%)
 rename src/{turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions => TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions}/v2WallFunction/v2WallFunctionFvPatchScalarField.H (97%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/include/nonLinearWallFunctionsI.H (98%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/include/wallDissipationI.H (95%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/include/wallNonlinearViscosityI.H (97%)
 create mode 100644 src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/kOmega/kOmega.C (68%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/kOmega/kOmega.H (84%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/kkLOmega/kkLOmega.C (87%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/kkLOmega/kkLOmega.H (89%)
 rename src/{turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C => TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C} (73%)
 rename src/{turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H => TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H} (76%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/qZeta/qZeta.C (72%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/qZeta/qZeta.H (75%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/v2f/v2f.C (74%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/incompressible/turbulentTransportModels}/RAS/v2f/v2f.H (77%)
 rename src/{turbulenceModels/incompressible/RAS => TurbulenceModels/incompressible/turbulentTransportModels}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C (93%)
 rename src/{turbulenceModels/incompressible/RAS => TurbulenceModels/incompressible/turbulentTransportModels}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H (98%)
 rename src/{turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H => TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H} (58%)
 rename src/TurbulenceModels/incompressible/{incompressibleTurbulenceModels.C => turbulentTransportModels/turbulentTransportModels.C} (82%)
 rename src/{turbulenceModels/incompressible/LES/SpalartAllmarasIDDES => TurbulenceModels/turbulenceModels/LES/LESdeltas}/IDDESDelta/IDDESDelta.C (60%)
 rename src/{turbulenceModels/incompressible/LES/SpalartAllmarasIDDES => TurbulenceModels/turbulenceModels/LES/LESdeltas}/IDDESDelta/IDDESDelta.H (88%)
 rename src/{turbulenceModels/incompressible/LES => TurbulenceModels/turbulenceModels/LES/LESdeltas}/vanDriestDelta/vanDriestDelta.C (61%)
 rename src/{turbulenceModels/incompressible/LES => TurbulenceModels/turbulenceModels/LES/LESdeltas}/vanDriestDelta/vanDriestDelta.H (87%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C (55%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H (64%)
 create mode 100644 src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
 rename src/{turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H => TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H} (54%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C (54%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H (63%)
 create mode 100644 src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
 rename src/{turbulenceModels/compressible => TurbulenceModels/turbulenceModels}/RAS/LaunderSharmaKE/LaunderSharmaKE.H (65%)
 create mode 100644 src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/RAS/SpalartAllmaras/SpalartAllmaras.H (68%)
 rename src/{turbulenceModels/incompressible/turbulenceModel => TurbulenceModels/turbulenceModels/RAS}/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C (97%)
 rename src/{turbulenceModels/incompressible/turbulenceModel => TurbulenceModels/turbulenceModels/RAS}/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H (96%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C (96%)
 rename src/{turbulenceModels/incompressible => TurbulenceModels/turbulenceModels}/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H (91%)
 create mode 100644 src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
 rename src/{turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H => TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H} (52%)
 create mode 100644 src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
 rename src/{turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H => TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H} (53%)
 create mode 100644 src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
 rename src/{turbulenceModels/incompressible/RAS/laminar/laminar.H => TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H} (56%)
 rename src/{turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.H => lagrangian/Turbulence/parcels/include/makeThermoParcelTurbulenceForces.H} (77%)
 create mode 100644 src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
 create mode 100644 src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
 rename src/{turbulenceModels/compressible/RAS/RASModel/RASModelDoc.H => lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H} (74%)
 rename src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/{mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C => nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C} (62%)
 rename src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/{mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.H => nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H} (76%)
 delete mode 100755 src/turbulenceModels/Allwmake
 delete mode 100755 src/turbulenceModels/LES/Allwmake
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/Make/files
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/Make/options
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
 delete mode 100644 src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
 delete mode 100644 src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
 delete mode 100644 src/turbulenceModels/LES/LESfilters/Make/files
 delete mode 100644 src/turbulenceModels/LES/LESfilters/Make/options
 delete mode 100644 src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
 delete mode 100644 src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
 delete mode 100644 src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
 delete mode 100644 src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
 delete mode 100644 src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C
 delete mode 100644 src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
 delete mode 100755 src/turbulenceModels/compressible/Allwmake
 delete mode 100644 src/turbulenceModels/compressible/LES/DESModel/DESModel.C
 delete mode 100644 src/turbulenceModels/compressible/LES/DESModel/DESModelDoc.H
 delete mode 100644 src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
 delete mode 100644 src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
 delete mode 100644 src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
 delete mode 100644 src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
 delete mode 100644 src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
 delete mode 100644 src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
 delete mode 100644 src/turbulenceModels/compressible/LES/LESModel/LESModel.C
 delete mode 100644 src/turbulenceModels/compressible/LES/LESModel/LESModel.H
 delete mode 100644 src/turbulenceModels/compressible/LES/LESModel/LESModelDoc.H
 delete mode 100644 src/turbulenceModels/compressible/LES/Make/files
 delete mode 100644 src/turbulenceModels/compressible/LES/Make/options
 delete mode 100644 src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
 delete mode 100644 src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
 delete mode 100644 src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
 delete mode 100644 src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
 delete mode 100644 src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C
 delete mode 100644 src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H
 delete mode 100644 src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
 delete mode 100644 src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
 delete mode 100644 src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
 delete mode 100644 src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
 delete mode 100644 src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
 delete mode 100644 src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
 delete mode 100644 src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
 delete mode 100644 src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/LRR/LRR.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/LRR/LRR.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/Make/files
 delete mode 100644 src/turbulenceModels/compressible/RAS/Make/options
 delete mode 100644 src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/doc/compressibleRASBoundaryConditionsDoc.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/laminar/laminar.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/laminar/laminar.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
 delete mode 100644 src/turbulenceModels/compressible/RAS/v2f/v2f.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/v2f/v2f.H
 delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/Make/files
 delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/Make/options
 delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
 delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
 delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
 delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/Make/files
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/Make/options
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
 delete mode 100644 src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.C
 delete mode 100755 src/turbulenceModels/incompressible/Allwmake
 delete mode 100644 src/turbulenceModels/incompressible/LES/DESModel/DESModel.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/DESModel/DESModelDoc.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/LESModel/LESModelDoc.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/Make/files
 delete mode 100644 src/turbulenceModels/incompressible/LES/Make/options
 delete mode 100644 src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/laminar/laminar.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/laminar/laminar.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
 delete mode 100644 src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
 delete mode 100644 src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/LRR/LRR.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/LRR/LRR.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/Make/files
 delete mode 100644 src/turbulenceModels/incompressible/RAS/Make/options
 delete mode 100644 src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/RASModel/RASModelDoc.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/doc/incompressibleRASBoundaryConditionsDoc.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
 delete mode 100644 src/turbulenceModels/incompressible/RAS/laminar/laminar.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
 delete mode 100644 src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/Make/files
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/Make/options
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
 delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
 rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/{mut => nut} (89%)
 delete mode 100644 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/RASProperties
 rename tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/{mut => nut} (95%)
 rename tutorials/combustion/engineFoam/kivaTest/-180/{mut => nut} (87%)
 rename tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/{alphaSgs => alphat} (98%)
 rename tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/{muSgs => nut} (89%)
 delete mode 100644 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties
 rename tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/{alphaSgs => alphat} (94%)
 rename tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/{muSgs => nut} (91%)
 delete mode 100644 tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/LESProperties
 rename tutorials/combustion/fireFoam/les/smallPoolFire2D/0/{muSgs => alphat} (98%)
 rename tutorials/combustion/fireFoam/les/smallPoolFire2D/0/{alphaSgs => nut} (95%)
 delete mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties
 rename tutorials/combustion/fireFoam/les/smallPoolFire3D/0/{muSgs => alphat} (97%)
 rename tutorials/combustion/fireFoam/les/smallPoolFire3D/0/{alphaSgs => nut} (94%)
 delete mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties
 rename tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/{mut => nut} (85%)
 rename tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/{mut => nut} (86%)
 rename tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/{alphaSgs => alphat} (100%)
 rename tutorials/{incompressible/pisoFoam/les/pitzDailyMapped/0/nuSgs => compressible/rhoPimpleFoam/les/pitzDaily/0/nut} (98%)
 delete mode 100644 tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/LESProperties
 rename tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/{mut => nut} (85%)
 rename tutorials/compressible/rhoPimpleFoam/ras/cavity/0/{mut => nut} (91%)
 rename tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/{mut => nut} (88%)
 delete mode 100644 tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/RASProperties
 rename tutorials/compressible/rhoPimplecFoam/angledDuct/0/{mut => nut} (85%)
 delete mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties
 rename tutorials/compressible/{rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut => rhoPorousSimpleFoam/angledDuctImplicit/0/nut} (85%)
 delete mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
 create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
 rename tutorials/compressible/{rhoPorousSimpleFoam/angledDuctImplicit/0/mut => rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut} (85%)
 delete mode 100644 tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/RASProperties
 create mode 100644 tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
 rename tutorials/compressible/rhoSimplecFoam/squareBend/0/{mut => nut} (92%)
 delete mode 100644 tutorials/compressible/rhoSimplecFoam/squareBend/constant/RASProperties
 rename tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/{mut => nut} (92%)
 delete mode 100644 tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties
 rename tutorials/compressible/sonicFoam/ras/prism/0/{mut => nut} (93%)
 delete mode 100644 tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties
 delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/RASProperties
 create mode 100644 tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
 delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties
 create mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
 delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties
 create mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
 rename tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/{mut => nut} (85%)
 delete mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/RASProperties
 rename tutorials/heatTransfer/buoyantSimpleFoam/{externalCoupledCavity/0/mut => buoyantCavity/0/nut} (83%)
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
 rename tutorials/{compressible/rhoPimpleFoam/ras/cavity/constant/RASProperties => heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties} (89%)
 rename tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/{mut => nut} (91%)
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/RASProperties
 rename tutorials/{compressible/rhoPimpleFoam/ras/angledDuct/constant/RASProperties => heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties} (89%)
 rename tutorials/heatTransfer/buoyantSimpleFoam/{buoyantCavity/0/mut => externalCoupledCavity/0/nut} (83%)
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/RASProperties
 create mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties
 rename tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/{mut => nut} (83%)
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/RASProperties
 rename tutorials/{combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties => heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties} (90%)
 rename tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/{mut => nut} (86%)
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/RASProperties
 rename tutorials/{compressible/rhoLTSPimpleFoam/angledDuct/constant/RASProperties => heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties} (90%)
 delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
 delete mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
 create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat
 create mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut
 delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/RASProperties
 delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/RASProperties
 delete mode 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/RASProperties
 delete mode 120000 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/RASProperties
 delete mode 100644 tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/RASProperties
 delete mode 100644 tutorials/incompressible/SRFSimpleFoam/mixer/constant/RASProperties
 create mode 100644 tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
 create mode 100644 tutorials/incompressible/SRFSimpleFoam/mixer/turbulenceProperties
 delete mode 100644 tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/RASProperties
 rename tutorials/{combustion/engineFoam/kivaTest/constant/RASProperties => incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties} (90%)
 delete mode 100644 tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
 create mode 100644 tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
 create mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties
 create mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/RASProperties
 rename tutorials/{multiphase/multiphaseEulerFoam/bubbleColumn/0/nuSgs => incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut} (61%)
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/RASProperties
 create mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/pimpleFoam/TJunction/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pimpleFoam/TJunctionFan/constant/RASProperties
 rename tutorials/incompressible/pimpleFoam/channel395/0.org/{nuSgs => nut} (98%)
 delete mode 100644 tutorials/incompressible/pimpleFoam/channel395/0/nuSgs.gz
 delete mode 100644 tutorials/incompressible/pimpleFoam/channel395/constant/LESProperties
 delete mode 100644 tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pimpleFoam/pitzDaily/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/LESProperties
 delete mode 100644 tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/nuSgs
 delete mode 100644 tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/RASProperties
 rename tutorials/{compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/RASProperties => incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties} (90%)
 rename tutorials/incompressible/pisoFoam/les/pitzDaily/0/{nuSgs => nut} (98%)
 delete mode 100644 tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
 rename tutorials/{compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs => incompressible/pisoFoam/les/pitzDailyMapped/0/nut} (95%)
 delete mode 100644 tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/LESProperties
 create mode 100644 tutorials/incompressible/pisoFoam/ras/cavity/0/omega
 delete mode 100644 tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties
 delete mode 100644 tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/RASProperties
 delete mode 100644 tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties
 create mode 100644 tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/RASProperties
 create mode 100644 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties
 create mode 100644 tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/simpleFoam/mixerVessel2D/constant/RASProperties
 create mode 100644 tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
 create mode 100644 tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/simpleFoam/pipeCyclic/constant/RASProperties
 delete mode 100644 tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties
 create mode 100644 tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
 delete mode 100644 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties
 create mode 100644 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
 rename tutorials/incompressible/simpleFoam/turbineSiting/constant/{RASProperties => turbulenceProperties} (58%)
 rename tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/{mut => nut} (95%)
 delete mode 100644 tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/RASProperties
 rename tutorials/lagrangian/{simpleReactingParcelFoam/verticalChannel/0.org/mut => LTSReactingParcelFoam/verticalChannel/0.org/nut} (93%)
 rename tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/{0.org/mut => 0/nut} (93%)
 delete mode 100644 tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/RASProperties
 delete mode 100644 tutorials/lagrangian/MPPICFoam/column/constant/RASProperties
 rename tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/{mut => nut} (86%)
 delete mode 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
 delete mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
 delete mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
 rename tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/{mut => nut} (88%)
 delete mode 100644 tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/RASProperties
 rename tutorials/lagrangian/reactingParcelFoam/filter/0.org/{mut => nut} (93%)
 rename tutorials/lagrangian/reactingParcelFoam/filter/0/{mut => nut} (93%)
 delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/constant/RASProperties
 rename tutorials/lagrangian/{LTSReactingParcelFoam/verticalChannel/0/mut => reactingParcelFoam/verticalChannel/0.org/nut} (93%)
 delete mode 100644 tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/RASProperties
 rename tutorials/lagrangian/{reactingParcelFoam/verticalChannel/0.org/mut => simpleReactingParcelFoam/verticalChannel/0.org/nut} (93%)
 delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/mut
 create mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut
 delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/RASProperties
 rename tutorials/lagrangian/sprayFoam/aachenBomb/0/{mut => nut} (90%)
 delete mode 100644 tutorials/lagrangian/sprayFoam/aachenBomb/constant/RASProperties
 delete mode 100644 tutorials/mesh/foamyHexMesh/mixerVessel/constant/RASProperties
 delete mode 100644 tutorials/multiphase/LTSInterFoam/DTCHull/constant/RASProperties
 rename tutorials/multiphase/cavitatingFoam/les/throttle/0/{nuSgs => nut} (98%)
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
 rename tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/{nuSgs => nut} (98%)
 delete mode 100644 tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
 delete mode 100644 tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
 delete mode 100644 tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/RASProperties
 delete mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/LESProperties
 delete mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/LESProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/RASProperties
 rename tutorials/multiphase/interFoam/les/nozzleFlow2D/0/{nuSgs => nut} (98%)
 delete mode 100644 tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
 delete mode 100644 tutorials/multiphase/interFoam/ras/angledDuct/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties
 delete mode 100644 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/RASProperties
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/LESProperties
 rename tutorials/multiphase/{interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties => multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties} (91%)
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/LESProperties
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/LESProperties
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties
 rename tutorials/{heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/RASProperties => multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties} (89%)
 delete mode 100644 tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/RASProperties

diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index b6c6398fd..6b89ae638 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -8,8 +8,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -20,8 +20,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lengine \
     -lmeshTools \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index ad6e2d029..1d56ab28f 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiuReactionThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 88d6305e1..190432570 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "psiuReactionThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
 #include "PDRDragModel.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
index 426e65981..de5b26c13 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicXiSubXiEq.H"
+#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
index 05aeb059f..f5a76fa5c 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicXiSubG.H"
+#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index feb9ae8d4..4cf942280 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "runTimeSelectionTables.H"
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
index d8e3a9ed9..be2cc6dab 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basic.H"
+#include "zeroGradientFvPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 12cfba078..73dbee566 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,8 +27,6 @@ License
 #include "PDRDragModel.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -47,15 +45,27 @@ addToRunTimeSelectionTable(RASModel, PDRkEpsilon, dictionary);
 
 PDRkEpsilon::PDRkEpsilon
 (
+    const geometricOneField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const fluidThermo& thermophysicalModel,
     const word& turbulenceModelName,
     const word& modelName
 )
 :
-    kEpsilon(rho, U, phi, thermophysicalModel, turbulenceModelName, modelName),
+    Foam::RASModels::kEpsilon<eddyDiffusivity<compressible::turbulenceModel> >
+    (
+        geometricOneField(),
+        rho,
+        U,
+        phi,
+        phi,
+        thermophysicalModel,
+        turbulenceModelName,
+        modelName
+    ),
 
     C4_
     (
@@ -96,12 +106,12 @@ void PDRkEpsilon::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
+        nut_ = Cmu_*sqr(k_)/epsilon_;
+        nut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
+        //***HGWalphat_ = mut_/Prt_;
+        //alphat_.correctBoundaryConditions();
 
         return;
     }
@@ -116,7 +126,7 @@ void PDRkEpsilon::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G(GName(), mut_*(tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G(GName(), rho_*nut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
     // Update espsilon and G at the wall
@@ -143,7 +153,7 @@ void PDRkEpsilon::correct()
     (
         betav*fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
+      - fvm::laplacian(rho_*DepsilonEff(), epsilon_)
      ==
         C1_*betav*G*epsilon_/k_
       + 1.5*pow(Cmu_, 3.0/4.0)*GR*sqrt(k_)/LI
@@ -165,7 +175,7 @@ void PDRkEpsilon::correct()
     (
         betav*fvm::ddt(rho_, k_)
       + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
+      - fvm::laplacian(rho_*DkEff(), k_)
      ==
         betav*G + GR
       - fvm::SuSp((2.0/3.0)*betav*rho_*divU, k_)
@@ -177,12 +187,12 @@ void PDRkEpsilon::correct()
     bound(k_, kMin_);
 
     // Re-calculate viscosity
-    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
+    nut_ = Cmu_*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
+    //***HGWalphat_ = mut_/Prt_;
+    //alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index d210aab70..689a47844 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,8 +60,8 @@ SourceFiles
 #ifndef compressiblePDRkEpsilon_H
 #define compressiblePDRkEpsilon_H
 
-
 #include "kEpsilon.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,7 +78,13 @@ namespace RASModels
 
 class PDRkEpsilon
 :
-    public kEpsilon
+    public Foam::RASModels::kEpsilon
+    <
+        eddyDiffusivity
+        <
+            compressible::turbulenceModel
+        >
+    >
 {
     // Private data
 
@@ -97,8 +103,10 @@ public:
         //- Construct from components
         PDRkEpsilon
         (
+            const geometricOneField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const fluidThermo& thermophysicalModel,
             const word& turbulenceModelName = turbulenceModel::typeName,
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
index 8fe73daa9..ba0e121e7 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "XiEqModel.H"
+#include "zeroGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
index 929c4df11..2574c4c14 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
index 3bc4b53a9..ac61eb7f8 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
index ad091f410..ae69d5bab 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,8 +92,9 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "psiuReactionThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
+#include "fvcDiv.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
index caf471a15..91ad18fdf 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "transport.H"
+#include "surfaceInterpolate.H"
+#include "fvmDdt.H"
+#include "fvcLaplacian.H"
+#include "fvmDiv.H"
+#include "fvmSup.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index 468cc1919..4860d14f4 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -7,7 +7,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
 
 EXE_LIBS = \
@@ -16,9 +17,8 @@ EXE_LIBS = \
     -lsampling \
     -lmeshTools \
     -lengine \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 84fac0482..898e79f41 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiuReactionThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options
index 9facf7ac9..79647a861 100644
--- a/applications/solvers/combustion/chemFoam/Make/options
+++ b/applications/solvers/combustion/chemFoam/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -12,8 +13,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lreactionThermophysicalModels \
     -lfluidThermophysicalModels \
     -lchemistryModel \
diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C
index 4183045a1..699a929bb 100644
--- a/applications/solvers/combustion/chemFoam/chemFoam.C
+++ b/applications/solvers/combustion/chemFoam/chemFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiReactionThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"
 #include "OFstream.H"
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index d688fb1e2..c49f5de1b 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -14,9 +15,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lengine \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lfiniteVolume \
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 43eb616e1..988cf128b 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "OFstream.H"
 #include "fvIOoptionList.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options
index fcbc3a420..0ede4569e 100644
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@@ -8,7 +8,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
 
 EXE_LIBS = \
@@ -17,9 +18,8 @@ EXE_LIBS = \
     -lsampling \
     -lmeshTools \
     -lengine \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index a35e22dc5..97c5cc56f 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "psiuReactionThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index cd5ad097a..cccf0a7da 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \
@@ -34,8 +35,8 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lspecie \
     -lfluidThermophysicalModels \
     -lsolidProperties \
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index b8c48549a..b70a9d6cc 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicReactingCloud.H"
 #include "surfaceFilmModel.H"
 #include "pyrolysisModelCollection.H"
diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C
index 0b3421086..9088b382a 100644
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "psiCombustionModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options
index abac9d96a..102806126 100644
--- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = -ggdb3 \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -17,9 +18,8 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lreactionThermophysicalModels \
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index 15cf68cb5..5a7c91bce 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -16,9 +17,8 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lreactionThermophysicalModels \
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 831df5c9a..755cf14ab 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "psiCombustionModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
index bf015097e..a9ea986c0 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -18,9 +19,8 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lreactionThermophysicalModels \
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
index fd4b6f58e..0adee03a9 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoCombustionModel.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
index bf015097e..a9ea986c0 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -18,9 +19,8 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lreactionThermophysicalModels \
     -lspecie \
     -lfluidThermophysicalModels \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
index 192fb7405..bdbf5f594 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoCombustionModel.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index 4ddaa7fb9..1b16a7b36 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -12,7 +13,6 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lrhoCentralFoam \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lmeshTools
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
index 33707728f..f79e10048 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -13,8 +14,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lrhoCentralFoam \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -ldynamicMesh \
     -lmeshTools
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index a42825342..d8f83da12 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "motionSolver.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 3ae35694e..164f0d1a2 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index c25d77014..8f38ef182 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -10,9 +11,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options
index 502938c53..669cd4a3d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -11,9 +12,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
index 8f2943f84..8ff8c28da 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "fvIOoptionList.H"
 #include "fvcSmooth.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options
index 2093b620b..f94f65e6a 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -14,9 +15,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index fcfc2aa79..f3676b66d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "bound.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 6c6c4e99a..ae43c9504 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "bound.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
index 502938c53..669cd4a3d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -11,9 +12,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
index 308a90e51..fd3e102dc 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "bound.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index 4606400cb..dc8643260 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -11,8 +11,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
index 39d6f696e..bf3eda587 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@@ -1,8 +1,8 @@
 EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -12,8 +12,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index fd30404ae..d8598bae4 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "fvIOoptionList.H"
 #include "IOporosityModelList.H"
 #include "simpleControl.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index c0a6282a3..1d70a557c 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "simpleControl.H"
 #include "fvIOoptionList.H"
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
index cc82ba958..bf3eda587 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
@@ -1,8 +1,8 @@
 EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -12,7 +12,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
index a7c9b2070..bad31d378 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "mixedFvPatchFields.H"
 #include "bound.H"
 #include "simpleControl.H"
diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options
index b1663bb82..92ca5cd17 100644
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
@@ -10,9 +11,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lmeshTools \
     -lsampling \
     -lfvOptions \
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
index 761311a8b..1561dffa7 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I../../rhoPimpleFoam/rhoPimpleDyMFoam \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -15,9 +16,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index 5a8e0b92e..a78ef861d 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 875e7afa7..1042889db 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
index 1e23e4594..9a60cac43 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
@@ -1,21 +1,21 @@
 EXE_INC = \
     -I../buoyantBoussinesqSimpleFoam \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lincompressibleTransportModels \
+    -lradiationModels \
     -lfiniteVolume \
     -lfvOptions \
     -lsampling \
-    -lmeshTools \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleTransportModels \
-    -lradiationModels
+    -lmeshTools
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index 5827ddf2c..1e9fca7f8 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -47,7 +47,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "radiationModel.H"
 #include "fvIOoptionList.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
index 6a6311e47..48d83838a 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
@@ -1,18 +1,18 @@
 EXE_INC = \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lincompressibleTransportModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
-    -lfvOptions \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleTransportModels
+    -lfvOptions
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index bcf4729a4..e9a964c81 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -47,7 +47,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "fvIOoptionList.H"
 #include "simpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
index e57cfc441..fc4620b28 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -15,7 +16,5 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lradiationModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels
-
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index 9d62893f1..379216854 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "radiationModel.H"
 #include "fvIOoptionList.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index 11decf6bb..383ee341f 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -5,9 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -17,6 +16,6 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lmeshTools
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 2e52da8f5..6c05e0cac 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "radiationModel.H"
 #include "simpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index 359d2d452..75695454d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -11,7 +11,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
@@ -21,9 +22,8 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidThermo \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lmeshTools \
     -lfiniteVolume \
     -lradiationModels \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 6aae0cf5b..7ee8492cb 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-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"
 #include "compressibleCourantNo.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
index 93b544d0e..e3c4d178f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -9,9 +9,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
@@ -21,9 +20,8 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidThermo \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lradiationModels \
     -lfvOptions \
     -lregionModels \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
index 75720dd51..6c07dcbdf 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"
 #include "solidThermo.H"
diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options
index d4d56df1b..fc4620b28 100644
--- a/applications/solvers/heatTransfer/thermoFoam/Make/options
+++ b/applications/solvers/heatTransfer/thermoFoam/Make/options
@@ -5,11 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -19,6 +16,5 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lradiationModels \
     -lspecie \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
index f765ca86e..a23ce288e 100644
--- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
+++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,8 +31,8 @@ Description
 
 #include "fvCFD.H"
 #include "rhoThermo.H"
-#include "turbulenceModel.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "LESModel.H"
 #include "radiationModel.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
index 1223bdd06..50a9de019 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
@@ -1,11 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index 62a083e36..460e72c5e 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -47,7 +47,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "simpleControl.H"
 
 template<class Type>
diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index d993beac0..895199f10 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -1,14 +1,14 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 03ccffcce..39d214a6e 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -37,7 +37,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "wallFvPatch.H"
 #include "makeGraph.H"
 
diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options
index a597aafbc..bc0201f37 100644
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -9,10 +10,9 @@ EXE_INC = \
 
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
index 7cdb6a555..20feab872 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -8,10 +9,9 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index f6beed973..f9c35f073 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "SRFModel.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
index 263fd7375..90e43d56a 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I.. \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -11,10 +12,9 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfiniteVolume \
     -lfvOptions \
     -lsampling \
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 3feb2a97f..7c23e6583 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 8361c5462..85861ae39 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -36,7 +36,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "IOporosityModelList.H"
diff --git a/applications/solvers/incompressible/pisoFoam/Make/options b/applications/solvers/incompressible/pisoFoam/Make/options
index 259f95f7b..23368faba 100644
--- a/applications/solvers/incompressible/pisoFoam/Make/options
+++ b/applications/solvers/incompressible/pisoFoam/Make/options
@@ -1,13 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 14237946a..b812418fd 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index f9913bf0d..bc0201f37 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -10,8 +10,8 @@ EXE_INC = \
 
 
 EXE_LIBS = \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
index cae6c88fe..a888499d8 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
@@ -1,17 +1,18 @@
 EXE_INC = \
     -I.. \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
 EXE_LIBS = \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
index 354757b66..00178524a 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "SRFModel.H"
 #include "simpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
index 6cee67f66..a888499d8 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     -I.. \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -11,8 +11,8 @@ EXE_INC = \
 
 
 EXE_LIBS = \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
index d10ba2d1e..a6c48d7c1 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "simpleControl.H"
 #include "IOMRFZoneList.H"
 #include "IOporosityModelList.H"
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index 9541bcbd1..807c1e5a0 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -31,7 +31,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "simpleControl.H"
 #include "fvIOoptionList.H"
 
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
index 1aeca7795..3ade3bbfd 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 #include "makeTurbulenceModel.H"
 
 #include "laminar.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "LESModel.H"
 
 makeBaseTurbulenceModel
diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
index 4a0c3a565..843220db5 100644
--- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
@@ -22,7 +22,7 @@ EXE_LIBS = \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
-    -llagrangianTurbulentSubModels \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lspecie \
     -lradiationModels \
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index 83684e57c..5734ebb65 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -21,7 +21,7 @@ EXE_LIBS = \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
-    -llagrangianTurbulentSubModels \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lspecie \
     -lradiationModels \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 8abe45c5c..5689c1bab 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
@@ -30,9 +31,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
@@ -54,4 +54,3 @@ EXE_LIBS = \
     -lcombustionModels \
     -lfvOptions \
     -lsampling
-
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 475e48a1c..fc28c3de4 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicThermoCloud.H"
 #include "coalCloud.H"
 #include "psiCombustionModel.H"
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index 05b6391ed..bec7663b6 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -21,8 +22,8 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index e35babe8f..000a4abb2 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -25,8 +26,8 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index 8f7619cdd..b355148a9 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "basicKinematicCollidingCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index 2bf123845..befcb57d0 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "basicKinematicCollidingCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index b6f5cf105..96880c05c 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -30,8 +31,8 @@ EXE_LIBS = \
     -lfvOptions \
     -lsampling \
     -lmeshTools \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lspecie \
     -lfluidThermophysicalModels \
     -lsolidProperties \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
index 27f272100..08bc14d85 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicReactingCloud.H"
 #include "surfaceFilmModel.H"
 #include "psiCombustionModel.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C
index 7481ae79c..e81f37593 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicReactingMultiphaseCloud.H"
 #include "rhoCombustionModel.H"
 #include "radiationModel.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
index 1eb9a3dba..f0d8062ec 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
@@ -2,7 +2,8 @@ EXE_INC = \
     -I.. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
@@ -29,9 +30,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 997aeae66..cc79d690f 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
@@ -29,9 +30,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 1425a3e5f..30e44df94 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicReactingMultiphaseCloud.H"
 #include "rhoCombustionModel.H"
 #include "radiationModel.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index 997aeae66..cc79d690f 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
@@ -29,9 +30,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
index 6620d2af5..22667ba18 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicReactingMultiphaseCloud.H"
 #include "rhoCombustionModel.H"
 #include "radiationModel.H"
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 5c63b0d2f..404a0d373 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/spray/lnInclude \
@@ -30,9 +31,8 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index a8a0bfc56..487508d30 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/spray/lnInclude \
@@ -32,9 +33,8 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
index b91a3ad79..11caf270a 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 #include "fvCFD.H"
 #include "engineTime.H"
 #include "engineMesh.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicSprayCloud.H"
 #include "psiCombustionModel.H"
 #include "radiationModel.H"
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
index 1c93d3ab1..9da22ec75 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicSprayCloud.H"
 #include "psiCombustionModel.H"
 #include "radiationModel.H"
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 3e975674d..026161c0d 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
@@ -19,9 +20,8 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lradiationModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lregionModels \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 352678f85..6545c4d72 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "psiThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "basicKinematicCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options
index 5efeeb355..1bcdc8e83 100644
--- a/applications/solvers/multiphase/cavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -4,13 +4,12 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
-    -lfiniteVolume \
-    -lbarotropicCompressibilityModel
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lbarotropicCompressibilityModel \
+    -lfiniteVolume
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
index 34590e930..5ec5c9a72 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
@@ -5,19 +5,18 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
-    -lfiniteVolume \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lbarotropicCompressibilityModel \
+    -lfiniteVolume \
     -ldynamicMesh \
-    -lmeshTools \
-    -ldynamicFvMesh
+    -ldynamicFvMesh \
+    -lmeshTools
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
index 284ca97bd..9910f1a4b 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 #include "dynamicFvMesh.H"
 #include "barotropicCompressibilityModel.H"
 #include "incompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 2b04d58fb..78b929615 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "barotropicCompressibilityModel.H"
 #include "incompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index 54e9f74e4..a36fe0541 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
@@ -14,7 +15,6 @@ EXE_LIBS = \
     -ltwoPhaseMixture \
     -ltwoPhaseProperties \
     -linterfaceProperties \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index 123645b4c..91f2d03a2 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -18,9 +19,8 @@ EXE_LIBS = \
     -ltwoPhaseMixture \
     -ltwoPhaseProperties \
     -linterfaceProperties \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -ldynamicMesh \
     -lmeshTools \
     -ldynamicFvMesh \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 064441633..cf35e60be 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "twoPhaseMixtureThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 030b997f4..0559985b5 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "twoPhaseMixtureThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
index af7020f40..900ababa1 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
@@ -13,7 +14,6 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -linterfaceProperties \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
index 5648f2d3b..24ba56e3e 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 
 #include "fvCFD.H"
 #include "multiphaseMixtureThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
index 1e870c42a..575d8d793 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Description
 #include "CMULES.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "fvcSmooth.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options
index 14861f2b8..f0762e15d 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -13,9 +14,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index 207a796b1..df659a93d 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
@@ -12,9 +13,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
index b9638e612..2e8c289ff 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -15,9 +16,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -limmiscibleIncompressibleTwoPhaseMixture \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -ldynamicMesh \
     -ldynamicFvMesh \
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index 58d74a625..ba40cc3e1 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 #include "CMULES.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 6b6168bf0..deb001c4f 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Description
 #include "CMULES.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index 43456c904..7198616b3 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -IthreePhaseInterfaceProperties \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -17,9 +18,8 @@ EXE_LIBS = \
     -ltwoPhaseMixture \
     -ltwoPhaseProperties \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 09cb7f1c7..a39adb3c1 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 #include "CMULES.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleThreePhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options b/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options
index fffa41da9..7a3dd1e71 100644
--- a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options
@@ -5,7 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
@@ -14,9 +15,8 @@ EXE_INC = \
 EXE_LIBS = \
     -limmiscibleIncompressibleTwoPhaseMixture \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
index c17847bd3..ee2b6e4d5 100644
--- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Description
 #include "CMULES.H"
 #include "subCycle.H"
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "IOporosityModelList.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
index 4721c8896..254f3ad8b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
@@ -3,7 +3,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -IphaseChangeTwoPhaseMixtures/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -16,9 +17,8 @@ EXE_LIBS = \
     -linterfaceProperties \
     -ltwoPhaseProperties \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
index 3bf8a5dfb..0512ee194 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I../phaseChangeTwoPhaseMixtures/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -19,9 +20,8 @@ EXE_LIBS = \
     -linterfaceProperties \
     -ltwoPhaseProperties \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -ldynamicMesh \
     -ldynamicFvMesh \
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
index e336e4a0c..4afaca6ca 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "phaseChangeTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index 32f94bf30..7cd7ad43b 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "phaseChangeTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
index ab8d97099..86b52d338 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
@@ -7,8 +7,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/LES/LESModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
@@ -17,6 +17,6 @@ EXE_LIBS = \
     -linterfaceProperties \
     -lincompressibleTransportModels \
     -lcompressibleMultiphaseEulerianInterfacialModels \
-    -lincompressibleLESModels \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
index 7584d84f2..1dd551f8f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
@@ -10,7 +10,7 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
     const volScalarField& alpha = phase;
     volVectorField& U = phase.U();
 
-    volScalarField nuEff(sgsModel->nut() + iter().nu());
+    volScalarField nuEff(turbulence->nut() + iter().nu());
 
     UEqns.set
     (
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
index 79fa72d75..8de6d4902 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
@@ -89,8 +89,8 @@
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
 
-
-    autoPtr<incompressible::LESModel> sgsModel
+    // Construct incompressible turbulence model
+    autoPtr<incompressible::turbulenceModel> turbulence
     (
-        incompressible::LESModel::New(U, phi, fluid)
+        incompressible::turbulenceModel::New(U, phi, fluid)
     );
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
index d0285dc35..237a62a7c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 #include "dragModel.H"
 #include "heatTransferModel.H"
 #include "singlePhaseTransportModel.H"
-#include "LESModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "IOMRFZoneList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
         {
-            sgsModel->correct();
+            turbulence->correct();
             fluid.solve();
             rho = fluid.rho();
             #include "zonePhaseVolumes.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 27f633d62..2eb366fd9 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -4,7 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -14,9 +15,8 @@ EXE_LIBS = \
     -lmultiphaseInterFoam \
     -linterfaceProperties \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
index 836534822..e05b53a96 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
@@ -18,9 +19,8 @@ EXE_LIBS = \
     -lmultiphaseInterFoam \
     -linterfaceProperties \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -ldynamicMesh \
     -ldynamicFvMesh \
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
index acfa7eb3e..7e31d9e42 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "multiphaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index fdd93eae5..78bed884e 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "multiphaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
index a597aafbc..72a106ba1 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -10,9 +11,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfvOptions \
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
index 6772c7f35..df44bd78a 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I.. \
     -I../../interFoam/interDyMFoam \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -14,9 +15,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume \
     -ldynamicMesh \
     -ldynamicFvMesh \
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
index d44f3d2f0..cf0c1af3e 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
@@ -40,7 +40,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index 9cfe6f99e..4f4239890 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
@@ -36,7 +36,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index 53ea250a1..32f8d8e62 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -4,13 +4,12 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -ltwoPhaseMixture \
-    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lfiniteVolume
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 7593aeab1..4d1cdd3d9 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "MULES.H"
 #include "subCycle.H"
 #include "incompressibleTwoPhaseMixture.H"
-#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
diff --git a/applications/test/PisoFoam/Make/files b/applications/test/PisoFoam/Make/files
deleted file mode 100644
index 340f8016c..000000000
--- a/applications/test/PisoFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-PisoFoam.C
-
-EXE = $(FOAM_USER_APPBIN)/PisoFoam
diff --git a/applications/test/PisoFoam/Make/options b/applications/test/PisoFoam/Make/options
deleted file mode 100644
index d14a833f1..000000000
--- a/applications/test/PisoFoam/Make/options
+++ /dev/null
@@ -1,14 +0,0 @@
-EXE_INC = \
-    -I$(FOAM_SOLVERS)/incompressible/pisoFoam \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lturbulenceModels \
-    -lincompressibleTurbulenceModels \
-    -lincompressibleTransportModels \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C
deleted file mode 100644
index e6fa77087..000000000
--- a/applications/test/PisoFoam/PisoFoam.C
+++ /dev/null
@@ -1,149 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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
-    pisoFoam
-
-Description
-    Transient solver for incompressible flow.
-
-    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "setRootCase.H"
-
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "createFields.H"
-    #include "initContinuityErrs.H"
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.loop())
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        #include "readPISOControls.H"
-        #include "CourantNo.H"
-
-        // Pressure-velocity PISO corrector
-        {
-            // Momentum predictor
-
-            fvVectorMatrix UEqn
-            (
-                fvm::ddt(U)
-              + fvm::div(phi, U)
-              + turbulence->divDevReff(U)
-            );
-
-            UEqn.relax();
-
-            if (momentumPredictor)
-            {
-                solve(UEqn == -fvc::grad(p));
-            }
-
-            // --- PISO loop
-
-            for (int corr=0; corr<nCorr; corr++)
-            {
-                volScalarField rAU(1.0/UEqn.A());
-
-                volVectorField HbyA("HbyA", U);
-                HbyA = rAU*UEqn.H();
-                surfaceScalarField phiHbyA
-                (
-                    "phiHbyA",
-                    (fvc::interpolate(HbyA) & mesh.Sf())
-                  + fvc::ddtCorr(rAU, U, phi)
-                );
-
-                adjustPhi(phiHbyA, U, p);
-
-                // Non-orthogonal pressure corrector loop
-                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-                {
-                    // Pressure corrector
-
-                    fvScalarMatrix pEqn
-                    (
-                        fvm::laplacian(rAU, p) == fvc::div(phiHbyA)
-                    );
-
-                    pEqn.setReference(pRefCell, pRefValue);
-
-                    if
-                    (
-                        corr == nCorr-1
-                     && nonOrth == nNonOrthCorr
-                    )
-                    {
-                        pEqn.solve(mesh.solver("pFinal"));
-                    }
-                    else
-                    {
-                        pEqn.solve();
-                    }
-
-                    if (nonOrth == nNonOrthCorr)
-                    {
-                        phi = phiHbyA - pEqn.flux();
-                    }
-                }
-
-                #include "continuityErrs.H"
-
-                U = HbyA - rAU*fvc::grad(p);
-                U.correctBoundaryConditions();
-            }
-        }
-
-        laminarTransport.correct();
-        turbulence->correct();
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/PisoFoam/turbulenceModel.H b/applications/test/PisoFoam/turbulenceModel.H
deleted file mode 100644
index 77a4ab413..000000000
--- a/applications/test/PisoFoam/turbulenceModel.H
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "IncompressibleTurbulenceModel.H"
-
-namespace Foam
-{
-    namespace incompressible
-    {
-        typedef IncompressibleTurbulenceModel<transportModel> turbulenceModel;
-    }
-}
diff --git a/applications/test/RhoPimpleFoam/EEqn.H b/applications/test/RhoPimpleFoam/EEqn.H
deleted file mode 100644
index 9972bdfff..000000000
--- a/applications/test/RhoPimpleFoam/EEqn.H
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    volScalarField& he = thermo.he();
-
-    fvScalarMatrix EEqn
-    (
-        fvm::ddt(rho, he) + fvm::div(phi, he)
-      + fvc::ddt(rho, K) + fvc::div(phi, K)
-      + (
-            he.name() == "e"
-          ? fvc::div
-            (
-                fvc::absolute(phi/fvc::interpolate(rho), U),
-                p,
-                "div(phiv,p)"
-            )
-          : -dpdt
-        )
-      //- fvm::laplacian(turbulence->alphaEff(), he)
-      - fvm::laplacian(turbulence->muEff(), he)
-     ==
-        fvOptions(rho, he)
-    );
-
-    EEqn.relax();
-
-    fvOptions.constrain(EEqn);
-
-    EEqn.solve();
-
-    fvOptions.correct(he);
-
-    thermo.correct();
-}
diff --git a/applications/test/RhoPimpleFoam/Make/files b/applications/test/RhoPimpleFoam/Make/files
deleted file mode 100644
index 087a67d21..000000000
--- a/applications/test/RhoPimpleFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rhoPimpleFoam.C
-
-EXE = $(FOAM_USER_APPBIN)/RhoPimpleFoam
diff --git a/applications/test/RhoPimpleFoam/Make/options b/applications/test/RhoPimpleFoam/Make/options
deleted file mode 100644
index f8879e9ab..000000000
--- a/applications/test/RhoPimpleFoam/Make/options
+++ /dev/null
@@ -1,21 +0,0 @@
-EXE_INC = \
-    -I$(FOAM_SOLVERS)/compressible/rhoPimpleFoam \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
-
-EXE_LIBS = \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lincompressibleTransportModels \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsampling \
-    -lfvOptions
diff --git a/applications/test/RhoPimpleFoam/rhoPimpleFoam.C b/applications/test/RhoPimpleFoam/rhoPimpleFoam.C
deleted file mode 100644
index a73e90e27..000000000
--- a/applications/test/RhoPimpleFoam/rhoPimpleFoam.C
+++ /dev/null
@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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
-    rhoPimpleFoam
-
-Description
-    Transient solver for laminar or turbulent flow of compressible fluids
-    for HVAC and similar applications.
-
-    Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
-    pseudo-transient simulations.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "psiThermo.H"
-#include "turbulenceModel.H"
-#include "bound.H"
-#include "pimpleControl.H"
-#include "fvIOoptionList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
-    #include "createFields.H"
-    #include "createFvOptions.H"
-    #include "initContinuityErrs.H"
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        #include "readTimeControls.H"
-        #include "compressibleCourantNo.H"
-        #include "setDeltaT.H"
-
-        runTime++;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        if (pimple.nCorrPIMPLE() <= 1)
-        {
-            #include "rhoEqn.H"
-        }
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            #include "UEqn.H"
-            #include "EEqn.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-            }
-
-            if (pimple.turbCorr())
-            {
-                turbulence->correct();
-            }
-        }
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/RhoPimpleFoam/turbulenceModel.H b/applications/test/RhoPimpleFoam/turbulenceModel.H
deleted file mode 100644
index 23547aa0c..000000000
--- a/applications/test/RhoPimpleFoam/turbulenceModel.H
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "CompressibleTurbulenceModel.H"
-
-namespace Foam
-{
-    namespace compressible
-    {
-        typedef CompressibleTurbulenceModel<fluidThermo> turbulenceModel;
-    }
-}
diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options
index 4ce2e001e..9544389ab 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/Make/options
+++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options
@@ -4,7 +4,9 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
+    -lfluidThermophysicalModels \
     -lmeshTools \
     -ldynamicMesh \
-    -lfiniteVolume \
-    -lcompressibleRASModels
+    -lfiniteVolume
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 43f0c24cb..23e78b6bf 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -6,9 +6,7 @@ EXE_LIBS = \
     -lblockMesh \
     -lchemistryModel \
     -lcoalCombustion \
-    -lcompressibleLESModels \
-    -lcompressibleRASModels \
-    -lcompressibleTurbulenceModel \
+    -lcompressibleTurbulenceModels \
     -lconversion \
     -ldecompositionMethods \
     -ldistributed \
@@ -25,27 +23,21 @@ EXE_LIBS = \
     -lforces \
     -lfvMotionSolvers \
     -lgenericPatchFields \
-    -lincompressibleLESModels \
-    -lincompressibleRASModels \
     -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
+    -lincompressibleTurbulenceModels \
     -linterfaceProperties \
     -lIOFunctionObjects \
     -ljobControl \
     -llagrangian \
     -llagrangianIntermediate \
     -llaminarFlameSpeedModels \
-    -lLESdeltas \
-    -lLESfilters \
     -lliquidMixtureProperties \
     -lliquidProperties \
     -lmeshTools \
     -lmolecularMeasurements \
     -lmolecule \
-/*    -lmultiphaseInterFoam  */ \
     -lODE \
     -lOpenFOAM \
-/*    -lphaseModel  */ \
     -lpotential \
     -lradiationModels \
     -lrandomProcesses \
@@ -63,5 +55,6 @@ EXE_LIBS = \
     -lthermophysicalFunctions \
     -ltopoChangerFvMesh \
     -ltriSurface \
+    -lturbulenceModels \
     -ltwoPhaseProperties \
     -lutilityFunctionObjects
diff --git a/applications/utilities/miscellaneous/foamHelp/Make/options b/applications/utilities/miscellaneous/foamHelp/Make/options
index 41ca9e9b5..8191b8b00 100644
--- a/applications/utilities/miscellaneous/foamHelp/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/Make/options
@@ -5,11 +5,8 @@ EXE_INC = \
 EXE_LIBS = \
     -lhelpTypes \
     -lfiniteVolume \
-    -lincompressibleTurbulenceModel \
-    -lcompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lcompressibleRASModels \
-    -lincompressibleLESModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lradiationModels \
     -lfluidThermophysicalModels
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
index 01b25c79a..b3d092f10 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
@@ -3,11 +3,8 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lincompressibleTurbulenceModel \
-    -lcompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lcompressibleRASModels \
-    -lincompressibleLESModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lradiationModels \
     -lfluidThermophysicalModels
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index 012600720..220589ea7 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
@@ -9,13 +10,12 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 246a36fcc..99d7de9b9 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,13 +46,8 @@ Description
 #include "fvIOoptionList.H"
 
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-
-#include "incompressible/RAS/RASModel/RASModel.H"
-#include "incompressible/LES/LESModel/LESModel.H"
-
-#include "fluidThermo.H"
-#include "compressible/RAS/RASModel/RASModel.H"
-#include "compressible/LES/LESModel/LESModel.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 
 using namespace Foam;
 
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
index d1016e9d4..c5c3ac8e9 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options
+++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
@@ -1,10 +1,8 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lincompressibleTransportModels \
     -lfiniteVolume \
-    -lgenericPatchFields \
-    -lincompressibleRASModels \
-    -lincompressibleTransportModels
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 27b70cae0..fefdc6b78 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -1,18 +1,19 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleRASModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lmeshTools \
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 708cda721..f487a13e5 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,11 +30,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-
-#include "fluidThermo.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index 886256586..980dabb8d 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -1,11 +1,13 @@
 EXE_INC = \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleRASModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lfiniteVolume \
-    -lgenericPatchFields
+    -lgenericPatchFields \
+    -lfiniteVolume
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 1982b4f24..ce074ccc5 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,8 +35,8 @@ Source files:
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulentTransportModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -133,4 +133,3 @@ int main(int argc, char *argv[])
 
 
 // ************************************************************************* //
-
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index 1d984aa9b..09f921715 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -1,21 +1,21 @@
 EXE_INC = \
     -I$(LIB_SRC)/postProcessing/postCalc \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 544a11692..e4d0833ba 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,12 +36,9 @@ Description
 #include "calc.H"
 #include "fvc.H"
 
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RAS/RASModel/RASModel.H"
-#include "incompressible/LES/LESModel/LESModel.H"
-#include "fluidThermo.H"
-#include "compressible/RAS/RASModel/RASModel.H"
-#include "compressible/LES/LESModel/LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index cd09f8d5b..c1b5ad47e 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -8,10 +8,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lreactionThermophysicalModels \
     -lfiniteVolume \
     -lgenericPatchFields \
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
index c45c48b35..8c80f0cf2 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "solidThermo.H"
 #include "wallFvPatch.H"
 
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 240bf953b..3235acdec 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -1,14 +1,18 @@
 EXE_INC = \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleRASModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
     -lfiniteVolume \
     -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index 360f03b39..3cf944ea4 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,12 +34,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RAS/RASModel/RASModel.H"
-
-#include "fluidThermo.H"
-#include "compressible/RAS/RASModel/RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
index d7446846b..a3e31c220 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -1,13 +1,14 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/LES/LESModel \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
index e8d5f431a..731c6ea6b 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
+++ b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
@@ -31,8 +31,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "LESModel.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulentTransportModel.H"
+#include "nutWallFunctionFvPatchScalarField.H"
+
 #include "nearWallDist.H"
 #include "wallFvPatch.H"
 
@@ -50,7 +52,7 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(timeDirs[timeI], timeI);
         Info<< "Time = " << runTime.timeName() << endl;
-        fvMesh::readUpdateState state = mesh.readUpdate();
+        mesh.readUpdate();
 
         volScalarField yPlus
         (
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index 27b70cae0..cacf4eb31 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -1,18 +1,20 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleRASModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lmeshTools \
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index c66f88373..dde81571e 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -34,14 +34,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-
-#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RAS/RASModel/RASModel.H"
-#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
-
-#include "fluidThermo.H"
-#include "compressible/RAS/RASModel/RASModel.H"
-#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
+#include "nutWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,8 +49,7 @@ void calcIncompressibleYPlus
     volScalarField& yPlus
 )
 {
-    typedef incompressible::nutWallFunctionFvPatchScalarField
-        wallFunctionPatchField;
+    typedef nutWallFunctionFvPatchScalarField wallFunctionPatchField;
 
     #include "createPhi.H"
 
@@ -105,8 +100,7 @@ void calcCompressibleYPlus
     volScalarField& yPlus
 )
 {
-    typedef compressible::mutWallFunctionFvPatchScalarField
-        wallFunctionPatchField;
+    typedef nutWallFunctionFvPatchScalarField wallFunctionPatchField;
 
     IOobject rhoHeader
     (
@@ -145,31 +139,31 @@ void calcCompressibleYPlus
         )
     );
 
-    const volScalarField::GeometricBoundaryField mutPatches =
-        RASModel->mut()().boundaryField();
+    const volScalarField::GeometricBoundaryField nutPatches =
+        RASModel->nut()().boundaryField();
 
-    bool foundMutPatch = false;
-    forAll(mutPatches, patchi)
+    bool foundNutPatch = false;
+    forAll(nutPatches, patchi)
     {
-        if (isA<wallFunctionPatchField>(mutPatches[patchi]))
+        if (isA<wallFunctionPatchField>(nutPatches[patchi]))
         {
-            foundMutPatch = true;
+            foundNutPatch = true;
 
-            const wallFunctionPatchField& mutPw =
+            const wallFunctionPatchField& nutPw =
                 dynamic_cast<const wallFunctionPatchField&>
-                    (mutPatches[patchi]);
+                    (nutPatches[patchi]);
 
-            yPlus.boundaryField()[patchi] = mutPw.yPlus();
+            yPlus.boundaryField()[patchi] = nutPw.yPlus();
             const scalarField& Yp = yPlus.boundaryField()[patchi];
 
             Info<< "Patch " << patchi
-                << " named " << mutPw.patch().name()
+                << " named " << nutPw.patch().name()
                 << " y+ : min: " << gMin(Yp) << " max: " << gMax(Yp)
                 << " average: " << gAverage(Yp) << nl << endl;
         }
     }
 
-    if (!foundMutPatch)
+    if (!foundNutPatch)
     {
         Info<< "    no " << wallFunctionPatchField::typeName << " patches"
             << endl;
@@ -200,7 +194,7 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(timeDirs[timeI], timeI);
         Info<< "Time = " << runTime.timeName() << endl;
-        fvMesh::readUpdateState state = mesh.readUpdate();
+        mesh.readUpdate();
 
         volScalarField yPlus
         (
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
index e4ea36c3c..9778b15c0 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -1,15 +1,15 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lgenericPatchFields \
+    -lfiniteVolume \
     -lmeshTools
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 18fa6a61e..4f2a30fb5 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
 #include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files
deleted file mode 100644
index 41d3c8b6a..000000000
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-applyWallFunctionBoundaryConditions.C
-
-EXE = $(FOAM_APPBIN)/applyWallFunctionBoundaryConditions
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
deleted file mode 100644
index 60692ce67..000000000
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
+++ /dev/null
@@ -1,13 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude
-
-EXE_LIBS = \
-    -lincompressibleRASModels \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lcompressibleRASModels \
-    -lfiniteVolume \
-    -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
deleted file mode 100644
index 95222a4a7..000000000
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
+++ /dev/null
@@ -1,363 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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
-    applyWallFunctionBounaryConditions
-
-Description
-    Updates OpenFOAM RAS cases to use the new (v1.6) wall function framework.
-
-    Attempts to determine whether case is compressible or incompressible, or
-    can be supplied with -compressible command line argument.
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "fvMesh.H"
-#include "Time.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-
-#include "wallPolyPatch.H"
-
-#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H"
-#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H"
-#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H"
-#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H"
-
-#include "compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H"
-#include "compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H"
-#include "compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H"
-#include "compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-bool caseIsCompressible(const fvMesh& mesh)
-{
-    // Attempt flux field
-    IOobject phiHeader
-    (
-        "phi",
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE
-    );
-
-    if (phiHeader.headerOk())
-    {
-        surfaceScalarField phi(phiHeader, mesh);
-        if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
-        {
-            return true;
-        }
-    }
-
-    // Attempt density field
-    IOobject rhoHeader
-    (
-        "rho",
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE
-    );
-
-    if (rhoHeader.headerOk())
-    {
-        volScalarField rho(rhoHeader, mesh);
-        if (rho.dimensions() == dimDensity)
-        {
-            return true;
-        }
-    }
-
-    // Attempt pressure field
-    IOobject pHeader
-    (
-        "p",
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE
-    );
-
-    if (pHeader.headerOk())
-    {
-        volScalarField p(pHeader, mesh);
-        if (p.dimensions() == dimMass/sqr(dimTime)/dimLength)
-        {
-            return true;
-        }
-    }
-
-    // If none of the above are true, assume that the case is incompressible
-    return false;
-}
-
-
-void createVolScalarField
-(
-    const fvMesh& mesh,
-    const word& fieldName,
-    const dimensionSet& dims
-)
-{
-    IOobject fieldHeader
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE
-    );
-
-    if (!fieldHeader.headerOk())
-    {
-        Info<< "Creating field " << fieldName << nl << endl;
-
-        volScalarField field
-        (
-            IOobject
-            (
-                fieldName,
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            dimensionedScalar("zero", dims, 0.0)
-        );
-
-        field.write();
-    }
-}
-
-
-void replaceBoundaryType
-(
-    const fvMesh& mesh,
-    const word& fieldName,
-    const word& boundaryType,
-    const string& boundaryValue
-)
-{
-    IOobject header
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE
-    );
-
-    if (!header.headerOk())
-    {
-        return;
-    }
-
-    Info<< "Updating boundary types for field " << header.name() << endl;
-
-    const word oldTypeName = IOdictionary::typeName;
-    const_cast<word&>(IOdictionary::typeName) = word::null;
-
-    IOdictionary dict(header);
-
-    const_cast<word&>(IOdictionary::typeName) = oldTypeName;
-    const_cast<word&>(dict.type()) = dict.headerClassName();
-
-    // Make a backup of the old file
-    if (mvBak(dict.objectPath(), "old"))
-    {
-        Info<< "    Backup original file to "
-            << (dict.objectPath() + ".old") << endl;
-    }
-
-    // Loop through boundary patches and update
-    const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
-    dictionary& boundaryDict = dict.subDict("boundaryField");
-    forAll(bMesh, patchI)
-    {
-        if (isA<wallPolyPatch>(bMesh[patchI]))
-        {
-            word patchName = bMesh[patchI].name();
-            dictionary& oldPatch = boundaryDict.subDict(patchName);
-
-            dictionary newPatch(dictionary::null);
-            newPatch.add("type", boundaryType);
-            newPatch.add("value", ("uniform " + boundaryValue).c_str());
-
-            oldPatch = newPatch;
-        }
-    }
-
-    Info<< "    writing updated " << dict.name() << nl << endl;
-    dict.regIOobject::write();
-}
-
-
-void updateCompressibleCase(const fvMesh& mesh)
-{
-    Info<< "Case treated as compressible" << nl << endl;
-    createVolScalarField
-    (
-        mesh,
-        "mut",
-        dimArea/dimTime*dimDensity
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "mut",
-        compressible::mutkWallFunctionFvPatchScalarField::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "epsilon",
-        compressible::epsilonWallFunctionFvPatchScalarField::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "omega",
-        compressible::omegaWallFunctionFvPatchScalarField::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "k",
-        compressible::kqRWallFunctionFvPatchField<scalar>::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "q",
-        compressible::kqRWallFunctionFvPatchField<scalar>::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "R",
-        compressible::kqRWallFunctionFvPatchField<symmTensor>::
-            typeName,
-        "(0 0 0 0 0 0)"
-    );
-}
-
-
-void updateIncompressibleCase(const fvMesh& mesh)
-{
-    Info<< "Case treated as incompressible" << nl << endl;
-    createVolScalarField(mesh, "nut", dimArea/dimTime);
-
-    replaceBoundaryType
-    (
-        mesh,
-        "nut",
-        incompressible::nutkWallFunctionFvPatchScalarField::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "epsilon",
-        incompressible::epsilonWallFunctionFvPatchScalarField::
-            typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "omega",
-        incompressible::omegaWallFunctionFvPatchScalarField::
-            typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "k",
-        incompressible::kqRWallFunctionFvPatchField<scalar>::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "q",
-        incompressible::kqRWallFunctionFvPatchField<scalar>::typeName,
-        "0"
-    );
-    replaceBoundaryType
-    (
-        mesh,
-        "R",
-        incompressible::kqRWallFunctionFvPatchField<symmTensor>::typeName,
-        "(0 0 0 0 0 0)"
-    );
-}
-
-
-int main(int argc, char *argv[])
-{
-    #include "addTimeOptions.H"
-    argList::addBoolOption
-    (
-        "compressible",
-        "force use of compressible wall functions. Default is auto-detect."
-    );
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-
-    const bool compressible = args.optionFound("compressible");
-
-    Info<< "Updating turbulence fields to operate using new run time "
-        << "selectable" << nl << "wall functions"
-        << nl << endl;
-
-    if (compressible || caseIsCompressible(mesh))
-    {
-        updateCompressibleCase(mesh);
-    }
-    else
-    {
-        updateIncompressibleCase(mesh);
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
index a5b0bb577..c719bbebe 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lcompressibleTurbulenceModel
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
diff --git a/applications/utilities/preProcessing/faceAgglomerate/Make/options b/applications/utilities/preProcessing/faceAgglomerate/Make/options
index c2b07c702..3facebbe1 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/Make/options
+++ b/applications/utilities/preProcessing/faceAgglomerate/Make/options
@@ -4,7 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude
 
 EXE_LIBS = \
-    -lOpenFOAM \
     -lfiniteVolume \
     -lpairPatchAgglomeration \
     -ltriSurface \
diff --git a/applications/utilities/preProcessing/viewFactorsGen/Make/options b/applications/utilities/preProcessing/viewFactorsGen/Make/options
index b0dbd4000..89eb06d82 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/Make/options
+++ b/applications/utilities/preProcessing/viewFactorsGen/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
-    -lOpenFOAM \
     -lmeshTools \
     -ltriSurface \
     -ldistributed \
diff --git a/src/Allwmake b/src/Allwmake
index 925b3f211..c0ea041c3 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -61,7 +61,6 @@ wmake $targetType randomProcesses
 
 transportModels/Allwmake $targetType $*
 thermophysicalModels/Allwmake $targetType $*
-turbulenceModels/Allwmake $targetType $*
 TurbulenceModels/Allwmake $targetType $*
 wmake $targetType combustionModels
 regionModels/Allwmake $targetType $*
diff --git a/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H b/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H
index 40cee9b5f..93c7e16ac 100644
--- a/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H
+++ b/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
index 97ecb28ec..92b7aa226 100644
--- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class TransportModel>
 Foam::CompressibleTurbulenceModel<TransportModel>::
 CompressibleTurbulenceModel
 (
+    const word& type,
     const geometricOneField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
index 38ba5f90f..0a9cdfe58 100644
--- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,6 +72,7 @@ public:
         //- Construct
         CompressibleTurbulenceModel
         (
+            const word& type,
             const geometricOneField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files
index c4107f105..2f6e9f1dd 100644
--- a/src/TurbulenceModels/compressible/Make/files
+++ b/src/TurbulenceModels/compressible/Make/files
@@ -1,4 +1,19 @@
 compressibleTurbulenceModel.C
-compressibleTurbulenceModels.C
+turbulentFluidThermoModels/turbulentFluidThermoModels.C
+
+BCs = turbulentFluidThermoModels/derivedFvPatchFields
+$(BCs)/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C
+$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
+$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+$(BCs)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+
+turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options
index 55388cb59..1d4b638c6 100644
--- a/src/TurbulenceModels/compressible/Make/options
+++ b/src/TurbulenceModels/compressible/Make/options
@@ -4,11 +4,15 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lfluidThermophysicalModels \
+    -lsolidThermo \
+    -lsolidSpecie \
     -lturbulenceModels \
     -lspecie
diff --git a/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C
new file mode 100644
index 000000000..b7430341b
--- /dev/null
+++ b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpecificCompressibleTurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicCompressibleTurbulenceModel>
+Foam::SpecificCompressibleTurbulenceModel
+<
+    BasicCompressibleTurbulenceModel
+>::SpecificCompressibleTurbulenceModel
+(
+    const word& type,
+    const geometricOneField& alpha,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    BasicCompressibleTurbulenceModel
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+template<class BasicCompressibleTurbulenceModel>
+Foam::autoPtr
+<
+    Foam::SpecificCompressibleTurbulenceModel
+    <
+        BasicCompressibleTurbulenceModel
+    >
+>
+Foam::SpecificCompressibleTurbulenceModel
+<
+    BasicCompressibleTurbulenceModel
+>::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+{
+    return autoPtr<SpecificCompressibleTurbulenceModel>
+    (
+        static_cast<SpecificCompressibleTurbulenceModel*>(
+        BasicCompressibleTurbulenceModel::New
+        (
+            geometricOneField(),
+            rho,
+            U,
+            phi,
+            phi,
+            transport,
+            propertiesName
+        ).ptr())
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/DESModel/DESModel.H b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H
similarity index 56%
rename from src/turbulenceModels/compressible/LES/DESModel/DESModel.H
rename to src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H
index bf0532e03..d8cacd876 100644
--- a/src/turbulenceModels/compressible/LES/DESModel/DESModel.H
+++ b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,93 +22,89 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::DESModel
-
-Group
-    grpCmpDESTurbulence
+    Foam::SpecificCompressibleTurbulenceModel
 
 Description
-    Extension of LES models to provide an interface for Detached Eddy
-    Simulation turbulence models
-
-SeeAlso
-    Foam::LESModel
+    Templated abstract base class for specific (RAS/LES) compressible
+    turbulence models
 
 SourceFiles
-    DESModel.C
+    SpecificCompressibleTurbulenceModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleDESModel_H
-#define compressibleDESModel_H
+#ifndef SpecificCompressibleTurbulenceModel_H
+#define SpecificCompressibleTurbulenceModel_H
 
-// note: use full(er) path so that derived utilities can bring in
-// incompressible and compressible variants
-
-#include "compressible/LES/LESModel/LESModel.H"
+#include "CompressibleTurbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace compressible
-{
 
 /*---------------------------------------------------------------------------*\
-                          Class DESModel Declaration
+             Class SpecificCompressibleTurbulenceModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class DESModel
+template<class BasicCompressibleTurbulenceModel>
+class SpecificCompressibleTurbulenceModel
 :
-    public LESModel
+    public BasicCompressibleTurbulenceModel
 {
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        DESModel(const DESModel&);
-
-        //- Disallow default bitwise assignment
-        DESModel& operator=(const DESModel&);
-
-
 public:
 
+    typedef typename BasicCompressibleTurbulenceModel::transportModel
+        transportModel;
+
     // Constructors
 
         //- Construct from components
-        DESModel
+        SpecificCompressibleTurbulenceModel
         (
             const word& type,
+            const geometricOneField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName
+            const transportModel& transport,
+            const word& propertiesName
         );
 
 
     //- Destructor
-    virtual ~DESModel()
+    virtual ~SpecificCompressibleTurbulenceModel()
     {}
 
 
-    // Public Member Functions
+    // Selectors
 
-        //- Return the LES field indicator
-        virtual tmp<volScalarField> LESRegion() const = 0;
+        //- Return a reference to the selected RAS model
+        static autoPtr<SpecificCompressibleTurbulenceModel> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "SpecificCompressibleTurbulenceModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
index 533d8992b..0019bd281 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,6 +98,12 @@ public:
 
     // Member functions
 
+        //- Return the density field
+        const volScalarField& rho() const
+        {
+            return rho_;
+        }
+
         //- Return the volumetric flux field
         virtual tmp<surfaceScalarField> phi() const;
 
diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
new file mode 100644
index 000000000..a6dbee759
--- /dev/null
+++ b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "eddyDiffusivity.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+void Foam::eddyDiffusivity<BasicTurbulenceModel>::correctAlphat()
+{
+    alphat_ = this->rho_*this->nut()/Prt_;
+    alphat_.correctBoundaryConditions();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::eddyDiffusivity<BasicTurbulenceModel>::eddyDiffusivity
+(
+    const word& type,
+    const geometricOneField& alpha,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    BasicTurbulenceModel
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    // Prt_
+    // (
+    //     dimensioned<scalar>::lookupOrAddToDict
+    //     (
+    //         "Prt",
+    //         this->coeffDict_,
+    //         1.0
+    //     )
+    // ),
+
+    Prt_("Prt", dimless, 1.0),
+
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::autoPtr<Foam::eddyDiffusivity<BasicTurbulenceModel> >
+Foam::eddyDiffusivity<BasicTurbulenceModel>::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+{
+    return autoPtr<eddyDiffusivity>
+    (
+        static_cast<eddyDiffusivity*>(
+        BasicTurbulenceModel::New
+        (
+            rho,
+            U,
+            phi,
+            transport,
+            propertiesName
+        ).ptr())
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool Foam::eddyDiffusivity<BasicTurbulenceModel>::read()
+{
+    if (BasicTurbulenceModel::read())
+    {
+        Prt_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class BasicTurbulenceModel>
+void Foam::eddyDiffusivity<BasicTurbulenceModel>::correct()
+{
+    BasicTurbulenceModel::correct();
+    correctAlphat();
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
new file mode 100644
index 000000000..18d5c9828
--- /dev/null
+++ b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+Class
+    Foam::eddyDiffusivity
+
+Description
+    Templated abstract base class for single-phase compressible
+    turbulence models.
+
+SourceFiles
+    eddyDiffusivity.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef eddyDiffusivity_H
+#define eddyDiffusivity_H
+
+#include "CompressibleTurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class eddyDiffusivity Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicTurbulenceModel>
+class eddyDiffusivity
+:
+    public BasicTurbulenceModel
+{
+
+protected:
+
+    // Protected data
+
+        // Model coefficients
+
+            dimensionedScalar Prt_;
+
+        // Fields
+
+            volScalarField alphat_;
+
+
+    // Protected Member Functions
+
+        virtual void correctAlphat();
+
+
+public:
+
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
+    // Constructors
+
+        //- Construct
+        eddyDiffusivity
+        (
+            const word& type,
+            const geometricOneField& alpha,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
+            const surfaceScalarField& phi,
+            const transportModel& trasport,
+            const word& propertiesName
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected turbulence model
+        static autoPtr<eddyDiffusivity> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const transportModel& trasportModel,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
+
+
+    //- Destructor
+    virtual ~eddyDiffusivity()
+    {}
+
+
+    // Member Functions
+
+        //- Re-read model coefficients if they have changed
+        virtual bool read();
+
+        //- Return the turbulent thermal diffusivity for enthalpy [kg/m/s]
+        virtual tmp<volScalarField> alphat() const
+        {
+            return alphat_;
+        }
+
+        //- Return the turbulent thermal diffusivity for enthalpy for a patch
+        //  [kg/m/s]
+        virtual tmp<scalarField> alphat(const label patchi) const
+        {
+            return alphat()().boundaryField()[patchi];
+        }
+
+        //- Return the effective turbulent thermal diffusivity for temperature
+        //  [J/m/s/K]
+        virtual tmp<volScalarField> kappaEff() const
+        {
+            return this->transport_.kappaEff(alphat());
+        }
+
+        //- Return the effective turbulent thermal diffusivity for temperature
+        //  [J/m/s/K]
+        virtual tmp<scalarField> kappaEff(const label patchi) const
+        {
+            return this->transport_.kappaEff(alphat(patchi), patchi);
+        }
+
+        //- Return the effective turbulent thermal diffusivity for enthalpy
+        //  [kg/m/s]
+        virtual tmp<volScalarField> alphaEff() const
+        {
+            return this->transport_.alphaEff(alphat());
+        }
+
+        //- Return the effective turbulent thermal diffusivity for enthalpy
+        //  for a patch [kg/m/s]
+        virtual tmp<scalarField> alphaEff(const label patchi) const
+        {
+            return this->transport_.alphaEff(alphat(patchi), patchi);
+        }
+
+        //- Correct the turbulent thermal diffusivity for enthalpy
+        virtual void correct();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "eddyDiffusivity.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
new file mode 100644
index 000000000..5b25fe8d8
--- /dev/null
+++ b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "thermalDiffusivity.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class TransportModel>
+Foam::thermalDiffusivity<TransportModel>::thermalDiffusivity
+(
+    const word& type,
+    const geometricOneField& alpha,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    CompressibleTurbulenceModel<TransportModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+template<class TransportModel>
+Foam::autoPtr<Foam::thermalDiffusivity<TransportModel> >
+Foam::thermalDiffusivity<TransportModel>::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+{
+    return autoPtr<thermalDiffusivity>
+    (
+        static_cast<thermalDiffusivity*>(
+        CompressibleTurbulenceModel<transportModel>::New
+        (
+            rho,
+            U,
+            phi,
+            transport,
+            propertiesName
+        ).ptr())
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                IOobject::groupName("alphat", this->U_.group()),
+                this->runTime_.timeName(),
+                this->mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            this->mesh_,
+            dimensionedScalar("alphat", dimDensity*dimViscosity, 0.0)
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::scalarField>
+Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat
+(
+    const label patchi
+) const
+{
+    return tmp<scalarField>
+    (
+        new scalarField(this->mesh_.boundary()[patchi].size(), 0.0)
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
new file mode 100644
index 000000000..b62cfa2e9
--- /dev/null
+++ b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+Class
+    Foam::thermalDiffusivity
+
+Description
+    Templated abstract base class for single-phase compressible
+    turbulence models.
+
+SourceFiles
+    thermalDiffusivity.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef thermalDiffusivity_H
+#define thermalDiffusivity_H
+
+#include "CompressibleTurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class thermalDiffusivity Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class TransportModel>
+class thermalDiffusivity
+:
+    public CompressibleTurbulenceModel<TransportModel>
+{
+
+public:
+
+    typedef geometricOneField alphaField;
+    typedef volScalarField rhoField;
+    typedef TransportModel transportModel;
+
+
+    // Constructors
+
+        //- Construct
+        thermalDiffusivity
+        (
+            const word& type,
+            const geometricOneField& alpha,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
+            const surfaceScalarField& phi,
+            const transportModel& trasport,
+            const word& propertiesName
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected turbulence model
+        static autoPtr<thermalDiffusivity> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const transportModel& trasportModel,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
+
+
+    //- Destructor
+    virtual ~thermalDiffusivity()
+    {}
+
+
+    // Member Functions
+
+        //- Return the thermal diffusivity for temperature [J/m/s/K]
+        virtual tmp<volScalarField> kappa() const
+        {
+            return this->transport_.kappa();
+        }
+
+        //- Return the laminar thermal diffusivity for temperature on patch
+        //  [J/m/s/K]
+        virtual tmp<scalarField> kappa(const label patchi) const
+        {
+            return this->transport_.kappa(patchi);
+        }
+
+        //- Return the laminar thermal diffusivity for enthalpy [kg/m/s]
+        virtual tmp<volScalarField> alpha() const
+        {
+            return this->transport_.alpha();
+        }
+
+        //- Return the laminar thermal diffusivity for enthalpy on patch
+        //  [kg/m/s]
+        virtual tmp<scalarField> alpha(const label patchi) const
+        {
+            return this->transport_.alpha(patchi);
+        }
+
+        //- Return the turbulent thermal diffusivity for enthalpy [kg/m/s]
+        virtual tmp<volScalarField> alphat() const;
+
+        //- Return the turbulent thermal diffusivity for enthalpy for a patch
+        //  [kg/m/s]
+        virtual tmp<scalarField> alphat(const label patchi) const;
+
+        //- Return the effective turbulent thermal diffusivity for temperature
+        //  [J/m/s/K]
+        virtual tmp<volScalarField> kappaEff() const
+        {
+            return kappa();
+        }
+
+        //- Return the effective turbulent thermal diffusivity for temperature
+        //  [J/m/s/K]
+        virtual tmp<scalarField> kappaEff(const label patchi) const
+        {
+            return kappa(patchi);
+        }
+
+        //- Return the effective turbulent thermal diffusivity for enthalpy
+        //  [kg/m/s]
+        virtual tmp<volScalarField> alphaEff() const
+        {
+            return alpha();
+        }
+
+        //- Return the effective turbulent thermal diffusivity for enthalpy
+        //  for a patch [kg/m/s]
+        virtual tmp<scalarField> alphaEff(const label patchi) const
+        {
+            return alpha(patchi);
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "thermalDiffusivity.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModelDoc.H b/src/TurbulenceModels/compressible/turbulenceModelDoc.H
similarity index 94%
rename from src/turbulenceModels/compressible/turbulenceModel/turbulenceModelDoc.H
rename to src/TurbulenceModels/compressible/turbulenceModelDoc.H
index 17bc21095..5722cee54 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/compressible/turbulenceModelDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,5 +27,5 @@ License
 @{
     This group contains compressible turbulence models.
 @}
-    
+
 \*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
similarity index 87%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 654054456..02e87c7a7 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "convectiveHeatTransferFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "fvPatchFieldMapper.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -110,16 +110,26 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs()
 
     const label patchi = patch().index();
 
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
+    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
+
     const scalarField alphaEffw(turbModel.alphaEff(patchi));
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
+
+    const tmp<scalarField> tmuw = turbModel.mu(patchi);
+    const scalarField& muw = tmuw();
+
     const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
     const vectorField& Uc = turbModel.U();
     const vectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField& Tw = turbModel.thermo().T().boundaryField()[patchi];
-    const scalarField& pw = turbModel.thermo().p().boundaryField()[patchi];
-    const scalarField Cpw(turbModel.thermo().Cp(pw, Tw, patchi));
+    const scalarField& Tw = turbModel.transport().T().boundaryField()[patchi];
+    const scalarField& pw = turbModel.transport().p().boundaryField()[patchi];
+    const scalarField Cpw(turbModel.transport().Cp(pw, Tw, patchi));
 
     const scalarField kappaw(Cpw*alphaEffw);
     const scalarField Pr(muw*Cpw/kappaw);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
similarity index 98%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
index cbbd7869b..f1af5d918 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
similarity index 95%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index c4d54b83b..36b6ce879 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "externalCoupledTemperatureMixedFvPatchScalarField.H"
+#include "turbulentFluidThermoModel.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "OFstream.H"
-#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
@@ -127,7 +127,16 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
     scalarField qDot(this->patch().size(), 0.0);
 
     typedef compressible::turbulenceModel cmpTurbModelType;
-    static word turbName("turbulenceModel");
+
+    static word turbName
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
+
     static word thermoName("thermophysicalProperties");
 
     if (db().foundObject<cmpTurbModelType>(turbName))
@@ -135,7 +144,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
         const cmpTurbModelType& turbModel =
             db().lookupObject<cmpTurbModelType>(turbName);
 
-        const basicThermo& thermo = turbModel.thermo();
+        const basicThermo& thermo = turbModel.transport();
 
         const fvPatchScalarField& hep = thermo.he().boundaryField()[patchI];
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
index 3d17d955a..47fb91531 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index e6470981e..27306f29c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index ad4bc5fd8..0799e9dd7 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
similarity index 95%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index b128e562e..ff6c5e9f2 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 #include "volFields.H"
 #include "fluidThermo.H"
 #include "solidThermo.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
@@ -111,10 +111,15 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
         {
             typedef compressible::turbulenceModel turbulenceModel;
 
-            if (mesh.foundObject<turbulenceModel>("turbulenceModel"))
+            word turbName(turbulenceModel::propertiesName);
+
+            if
+            (
+                mesh.foundObject<turbulenceModel>(turbName)
+            )
             {
                 const turbulenceModel& turbModel =
-                    mesh.lookupObject<turbulenceModel>("turbulenceModel");
+                    mesh.lookupObject<turbulenceModel>(turbName);
 
                 return turbModel.kappaEff(patchI);
             }
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
similarity index 98%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index f90c8d90f..7385c39df 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
similarity index 98%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index 490bec5c7..caef41809 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "mappedPatchBase.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "mapDistribute.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -356,7 +356,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
         const compressible::turbulenceModel& turbModel =
             db().template lookupObject<compressible::turbulenceModel>
             (
-                "turbulenceModel"
+                turbulenceModel::propertiesName
             );
 
         // local properties
@@ -383,7 +383,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
 
         // nrb properties
         scalarField nbrTp =
-            turbModel.thermo().T().boundaryField()[nbrPatchi];
+            turbModel.transport().T().boundaryField()[nbrPatchi];
         mapDist.distribute(nbrTp);
 
         // solid properties
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
index bed019f4b..4df0d4382 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
similarity index 97%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
index ca3f23299..8eab80132 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
similarity index 96%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
index db7dcf0c9..8a3187abc 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
similarity index 91%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index e3d00dea6..646fbed66 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "IOobjectList.H"
-#include "turbulenceModel.H"
-
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::
@@ -154,16 +153,22 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
 
     const label patchI = patch().index();
 
-    const compressible::turbulenceModel& turbulence =
-        db().lookupObject<compressible::turbulenceModel>
-        (
-            "turbulenceModel"
+    const LESModel<eddyDiffusivity<compressible::turbulenceModel> >& turbModel =
+    db().lookupObject
+    <
+        LESModel<eddyDiffusivity<compressible::turbulenceModel> >
+    >   (
+            IOobject::groupName
+            (
+                turbulenceModel::propertiesName,
+                dimensionedInternalField().group()
+            )
         );
 
     const fvsPatchField<scalar>& phip =
         patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
 
-    const scalarField alphap(turbulence.alphaEff(patchI));
+    const scalarField alphap(turbModel.alphaEff(patchI));
 
     refValue() = massFluxFraction_;
     refGrad() = 0.0;
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
similarity index 98%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
index 79a1da68e..a6313f71a 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index 9f0f1a336..4ebd0c180 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
similarity index 98%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
index 740183e35..fc816b3d6 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index dff61c398..d304e598e 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index ac17f3c33..862abc185 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 19f8a971a..e610afc80 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
similarity index 99%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
index bbfe48c63..8c332402e 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 16b69874f..98a5a05f5 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "alphatJayatillekeWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -199,16 +199,27 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
 
     const label patchi = patch().index();
 
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
+    // Retrieve turbulence properties from model
+
+    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
 
     const scalar Cmu25 = pow025(Cmu_);
 
     const scalarField& y = turbModel.y()[patchi];
 
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
+    const tmp<scalarField> tmuw = turbModel.mu(patchi);
+    const scalarField& muw = tmuw();
+
+    const tmp<scalarField> talphaw = turbModel.alpha(patchi);
+    const scalarField& alphaw = talphaw();
 
-    const scalarField& alphaw = turbModel.alpha().boundaryField()[patchi];
     scalarField& alphatw = *this;
 
     const tmp<volScalarField> tk = turbModel.k();
@@ -220,12 +231,12 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
 
     const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
     const fvPatchScalarField& hew =
-        turbModel.thermo().he().boundaryField()[patchi];
+        turbModel.transport().he().boundaryField()[patchi];
 
     // Heat flux [W/m2] - lagging alphatw
     const scalarField qDot
     (
-        turbModel.thermo().alphaEff(alphatw, patchi)*hew.snGrad()
+        turbModel.transport().alphaEff(alphatw, patchi)*hew.snGrad()
     );
 
     // Populate boundary values
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
similarity index 98%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
index 5a43d7773..2626bafc3 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index dcf694ad1..90d223600 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    mutName_("mut"),
+    rhoName_("rho"),
+    nutName_("nut"),
     Prt_(0.85)
 {}
 
@@ -58,7 +59,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    mutName_(ptf.mutName_),
+    rhoName_(ptf.rhoName_),
+    nutName_(ptf.nutName_),
     Prt_(ptf.Prt_)
 {}
 
@@ -71,7 +73,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    mutName_(dict.lookupOrDefault<word>("mut", "mut")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    nutName_(dict.lookupOrDefault<word>("nut", "nut")),
     Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
 {}
 
@@ -82,7 +85,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(awfpsf),
-    mutName_(awfpsf.mutName_),
+    rhoName_(awfpsf.rhoName_),
+    nutName_(awfpsf.nutName_),
     Prt_(awfpsf.Prt_)
 {}
 
@@ -94,7 +98,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(awfpsf, iF),
-    mutName_(awfpsf.mutName_),
+    rhoName_(awfpsf.rhoName_),
+    nutName_(awfpsf.nutName_),
     Prt_(awfpsf.Prt_)
 {}
 
@@ -108,10 +113,13 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const scalarField& mutw =
-        patch().lookupPatchField<volScalarField, scalar>(mutName_);
+    const scalarField& rhow =
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
-    operator==(mutw/Prt_);
+    const scalarField& nutw =
+        patch().lookupPatchField<volScalarField, scalar>(nutName_);
+
+    operator==(rhow*nutw/Prt_);
 
     fixedValueFvPatchScalarField::updateCoeffs();
 }
@@ -120,7 +128,8 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
 void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
     os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
similarity index 94%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index 0500caec6..f44ee6b8c 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Description
 
     \table
         Property     | Description             | Required    | Default value
-        mut          | turbulence viscosity field name | no  | mut
+        nut          | turbulence viscosity field name | no  | nut
         Prt          | turbulent Prandtl number | no          | 0.85
     \endtable
 
@@ -59,7 +59,7 @@ Description
     myPatch
     {
         type            alphatWallFunction;
-        mut             mut;
+        nut             nut;
         Prt             0.85;
         value           uniform 0; // optional value entry
     }
@@ -95,8 +95,11 @@ class alphatWallFunctionFvPatchScalarField
 {
     // Private data
 
-        //- Name of turbulent viscosity field (default = mut)
-        word mutName_;
+        //- Name of density field (default = rho)
+        word rhoName_;
+
+        //- Name of turbulent viscosity field (default = nut)
+        word nutName_;
 
         //- Turbulent Prandtl number (default = 0.85)
         scalar Prt_;
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
similarity index 94%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index 2efdccde5..bc5f23ced 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "wallHeatTransferFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -151,7 +151,11 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
     const compressible::turbulenceModel& turbModel =
         db().lookupObject<compressible::turbulenceModel>
         (
-            "turbulenceModel"
+            IOobject::groupName
+            (
+                turbulenceModel::propertiesName,
+                dimensionedInternalField().group()
+            )
         );
 
     const label patchi = patch().index();
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
similarity index 98%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
index a33ce4e47..1524f6c0b 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
new file mode 100644
index 000000000..ae0b0cb59
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#define makeBaseTurbulenceModel(Alpha, Rho, baseModel, BaseModel, Transport)   \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        typedef TurbulenceModel                                                \
+        <                                                                      \
+            Alpha,                                                             \
+            Rho,                                                               \
+            baseModel,                                                         \
+            Transport                                                          \
+        > Transport##baseModel;                                                \
+                                                                               \
+        defineTemplateRunTimeSelectionTable                                    \
+        (                                                                      \
+            Transport##baseModel,                                              \
+            dictionary                                                         \
+        );                                                                     \
+                                                                               \
+        typedef BaseModel<Transport> Transport##BaseModel;                     \
+                                                                               \
+                                                                               \
+        typedef laminar<Transport##BaseModel> Laminar##Transport##BaseModel;   \
+                                                                               \
+        defineNamedTemplateTypeNameAndDebug(Laminar##Transport##BaseModel, 0); \
+                                                                               \
+        addToRunTimeSelectionTable                                             \
+        (                                                                      \
+            Transport##baseModel,                                              \
+            Laminar##Transport##BaseModel,                                     \
+            dictionary                                                         \
+        );                                                                     \
+                                                                               \
+                                                                               \
+        typedef RASModel<eddyDiffusivity<Transport##BaseModel> >               \
+            RAS##Transport##BaseModel;                                         \
+                                                                               \
+        defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0);     \
+                                                                               \
+        defineTemplateRunTimeSelectionTable                                    \
+        (RAS##Transport##BaseModel, dictionary);                               \
+                                                                               \
+        addToRunTimeSelectionTable                                             \
+        (                                                                      \
+            Transport##baseModel,                                              \
+            RAS##Transport##BaseModel,                                         \
+            dictionary                                                         \
+        );                                                                     \
+                                                                               \
+                                                                               \
+        typedef LESModel<eddyDiffusivity<Transport##BaseModel> >               \
+            LES##Transport##BaseModel;                                         \
+                                                                               \
+        defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0);     \
+                                                                               \
+        defineTemplateRunTimeSelectionTable                                    \
+        (LES##Transport##BaseModel, dictionary);                               \
+                                                                               \
+        addToRunTimeSelectionTable                                             \
+        (                                                                      \
+            Transport##baseModel,                                              \
+            LES##Transport##BaseModel,                                         \
+            dictionary                                                         \
+        );                                                                     \
+    }
+
+
+#define makeTemplatedTurbulenceModel(BaseModel, SType, Type)                   \
+    namespace Foam                                                             \
+    {                                                                          \
+        namespace SType##Models                                                \
+        {                                                                      \
+            typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel;  \
+                                                                               \
+            defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0);    \
+                                                                               \
+            addToRunTimeSelectionTable                                         \
+            (                                                                  \
+                SType##BaseModel,                                              \
+                Type##SType##BaseModel,                                        \
+                dictionary                                                     \
+            );                                                                 \
+        }                                                                      \
+    }
+
+
+#define makeTurbulenceModel(BaseModel, SType, Type)                            \
+    namespace Foam                                                             \
+    {                                                                          \
+        namespace SType##Models                                                \
+        {                                                                      \
+            defineTypeNameAndDebug(Type, 0);                                   \
+                                                                               \
+            addToRunTimeSelectionTable                                         \
+            (                                                                  \
+                SType##BaseModel,                                              \
+                Type,                                                          \
+                dictionary                                                     \
+            );                                                                 \
+        }                                                                      \
+    }
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
similarity index 57%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index a62cd0806..7725dee97 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,29 +21,54 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::compressible::turbulenceModel
+
+Typedef
+    Foam::compressible::RASModel
+
+Typedef
+    Foam::compressible::LESModel
+
+Description
+    Typedefs for turbulence, RAS and LES models for compressible flow
+    based on the standard laminar transport package.
+
+SourceFiles
+    turbulentFluidThermoModels.C
+
 \*---------------------------------------------------------------------------*/
 
-#ifndef kqRWallFunctionFvPatchFields_H
-#define kqRWallFunctionFvPatchFields_H
+#ifndef turbulentFluidThermoModel_H
+#define turbulentFluidThermoModel_H
 
-#include "kqRWallFunctionFvPatchField.H"
-#include "fieldTypes.H"
+#include "SpecificCompressibleTurbulenceModel.H"
+#include "thermalDiffusivity.H"
+#include "eddyDiffusivity.H"
+#include "RASModel.H"
+#include "LESModel.H"
+#include "fluidThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace compressible
-{
+    namespace compressible
+    {
+        typedef thermalDiffusivity<fluidThermo> turbulenceModel;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+        typedef SpecificCompressibleTurbulenceModel
+        <
+            RASModel<eddyDiffusivity<turbulenceModel> >
+        > RASModel;
 
-makePatchTypeFieldTypedefs(kqRWallFunction);
+        typedef SpecificCompressibleTurbulenceModel
+        <
+            LESModel<eddyDiffusivity<turbulenceModel> >
+        > LESModel;
+    }
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
similarity index 78%
rename from src/TurbulenceModels/compressible/compressibleTurbulenceModels.C
rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index 054dee888..ad86b169a 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,11 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "CompressibleTurbulenceModel.H"
 #include "fluidThermo.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
+#include "thermalDiffusivity.H"
+#include "eddyDiffusivity.H"
+
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"
@@ -37,17 +39,20 @@ makeBaseTurbulenceModel
     geometricOneField,
     volScalarField,
     compressibleTurbulenceModel,
-    CompressibleTurbulenceModel,
+    thermalDiffusivity,
     fluidThermo
 );
 
 #define makeRASModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermoCompressibleTurbulenceModel, RAS, Type)
+    (fluidThermothermalDiffusivity, RAS, Type)
 
 #define makeLESModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermoCompressibleTurbulenceModel, LES, Type)
+    (fluidThermothermalDiffusivity, LES, Type)
+
+#include "SpalartAllmaras.H"
+makeRASModel(SpalartAllmaras);
 
 #include "kEpsilon.H"
 makeRASModel(kEpsilon);
@@ -55,6 +60,9 @@ makeRASModel(kEpsilon);
 #include "buoyantKEpsilon.H"
 makeRASModel(buoyantKEpsilon);
 
+#include "LaunderSharmaKE.H"
+makeRASModel(LaunderSharmaKE);
+
 #include "kOmegaSST.H"
 makeRASModel(kOmegaSST);
 
@@ -64,5 +72,14 @@ makeLESModel(Smagorinsky);
 #include "kEqn.H"
 makeLESModel(kEqn);
 
+#include "SpalartAllmarasDES.H"
+makeLESModel(SpalartAllmarasDES);
+
+#include "SpalartAllmarasDDES.H"
+makeLESModel(SpalartAllmarasDDES);
+
+#include "SpalartAllmarasIDDES.H"
+makeLESModel(SpalartAllmarasIDDES);
+
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
index ce93b0d59..447af12ff 100644
--- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,12 +31,13 @@ template<class TransportModel>
 Foam::IncompressibleTurbulenceModel<TransportModel>::
 IncompressibleTurbulenceModel
 (
+    const word& type,
     const geometricOneField& alpha,
     const geometricOneField& rho,
     const volVectorField& U,
     const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
-    const TransportModel& transportModel,
+    const TransportModel& transport,
     const word& propertiesName
 )
 :
@@ -53,7 +54,7 @@ IncompressibleTurbulenceModel
         U,
         alphaRhoPhi,
         phi,
-        transportModel,
+        transport,
         propertiesName
     )
 {}
@@ -67,7 +68,7 @@ Foam::IncompressibleTurbulenceModel<TransportModel>::New
 (
     const volVectorField& U,
     const surfaceScalarField& phi,
-    const TransportModel& transportModel,
+    const TransportModel& transport,
     const word& propertiesName
 )
 {
@@ -87,7 +88,7 @@ Foam::IncompressibleTurbulenceModel<TransportModel>::New
             U,
             phi,
             phi,
-            transportModel,
+            transport,
             propertiesName
         ).ptr())
     );
@@ -148,4 +149,23 @@ divDevRhoReff
 }
 
 
+template<class TransportModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::IncompressibleTurbulenceModel<TransportModel>::
+divDevRhoReff
+(
+    const volScalarField& rho,
+    volVectorField& U
+) const
+{
+    notImplemented
+    (
+        "IncompressibleTurbulenceModel<TransportModel>::"
+        "divDevRhoReff(const volScalarField& rho, volVectorField& U)"
+    );
+
+    return divDevReff(U);
+}
+
+
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
index c0d4af42a..eb9d8bfb0 100644
--- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "TurbulenceModel.H"
 #include "incompressibleTurbulenceModel.H"
+#include "fvMatrix.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,12 +73,13 @@ public:
         //- Construct
         IncompressibleTurbulenceModel
         (
+            const word& type,
             const geometricOneField& alpha,
             const geometricOneField& rho,
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const TransportModel& trasportModel,
+            const TransportModel& transport,
             const word& propertiesName
         );
 
@@ -112,6 +114,13 @@ public:
 
         //- Return the source term for the momentum equation
         virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevRhoReff
+        (
+            const volScalarField& rho,
+            volVectorField& U
+        ) const;
 };
 
 
diff --git a/src/TurbulenceModels/incompressible/Make/files b/src/TurbulenceModels/incompressible/Make/files
index 4b3ca65c1..4d4d5729b 100644
--- a/src/TurbulenceModels/incompressible/Make/files
+++ b/src/TurbulenceModels/incompressible/Make/files
@@ -1,4 +1,21 @@
 incompressibleTurbulenceModel.C
-incompressibleTurbulenceModels.C
+
+turbulentTransportModels/turbulentTransportModels.C
+turbulentTransportModels/RAS/kOmega/kOmega.C
+turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+turbulentTransportModels/RAS/v2f/v2f.C
+turbulentTransportModels/RAS/qZeta/qZeta.C
+turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
+turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
+turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
+turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
+
+BCs = turbulentTransportModels/RAS/derivedFvPatchFields
+$(BCs)/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
+$(BCs)/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
+
+turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels
diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options
index 617607373..acb769c06 100644
--- a/src/TurbulenceModels/incompressible/Make/options
+++ b/src/TurbulenceModels/incompressible/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
     -I../turbulenceModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude
+    -I$(LIB_SRC)/transportModels
 
 LIB_LIBS = \
     -lincompressibleTransportModels \
diff --git a/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C
new file mode 100644
index 000000000..f6ba580c0
--- /dev/null
+++ b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpecificIncompressibleTurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicIncompressibleTurbulenceModel>
+Foam::SpecificIncompressibleTurbulenceModel
+<
+    BasicIncompressibleTurbulenceModel
+>::SpecificIncompressibleTurbulenceModel
+(
+    const word& type,
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    BasicIncompressibleTurbulenceModel
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+template<class BasicIncompressibleTurbulenceModel>
+Foam::autoPtr
+<
+    Foam::SpecificIncompressibleTurbulenceModel
+    <
+        BasicIncompressibleTurbulenceModel
+    >
+>
+Foam::SpecificIncompressibleTurbulenceModel
+<
+    BasicIncompressibleTurbulenceModel
+>::New
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+{
+    return autoPtr<SpecificIncompressibleTurbulenceModel>
+    (
+        static_cast<SpecificIncompressibleTurbulenceModel*>(
+        BasicIncompressibleTurbulenceModel::New
+        (
+            geometricOneField(),
+            geometricOneField(),
+            U,
+            phi,
+            phi,
+            transport,
+            propertiesName
+        ).ptr())
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H
similarity index 56%
rename from src/turbulenceModels/incompressible/LES/DESModel/DESModel.H
rename to src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H
index 6aec3ee06..e7cc38118 100644
--- a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H
+++ b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,92 +22,88 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::DESModel
-
-Group
-    grpIcoDESTurbulence
+    Foam::SpecificIncompressibleTurbulenceModel
 
 Description
-    Extension of LES models to provide an interface for Detached Eddy
-    Simulation turbulence models
-
-SeeAlso
-    Foam::LESModel
+    Templated abstract base class for specific (RAS/LES) incompressible
+    turbulence models
 
 SourceFiles
-    DESModel.C
+    SpecificIncompressibleTurbulenceModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef incompressibleDESModel_H
-#define incompressibleDESModel_H
+#ifndef SpecificIncompressibleTurbulenceModel_H
+#define SpecificIncompressibleTurbulenceModel_H
 
-// note: use full(er) path so that derived utilities can bring in
-// incompressible and compressible variants
-
-#include "incompressible/LES/LESModel/LESModel.H"
+#include "IncompressibleTurbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 
 /*---------------------------------------------------------------------------*\
-                          Class DESModel Declaration
+           Class SpecificIncompressibleTurbulenceModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class DESModel
+template<class BasicIncompressibleTurbulenceModel>
+class SpecificIncompressibleTurbulenceModel
 :
-    public LESModel
+    public BasicIncompressibleTurbulenceModel
 {
 
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        DESModel(const DESModel&);
-
-        //- Disallow default bitwise assignment
-        DESModel& operator=(const DESModel&);
-
-
 public:
 
+    typedef typename BasicIncompressibleTurbulenceModel::transportModel
+        transportModel;
+
     // Constructors
 
         //- Construct from components
-        DESModel
+        SpecificIncompressibleTurbulenceModel
         (
             const word& type,
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName
+            const word& propertiesName
         );
 
 
     //- Destructor
-    virtual ~DESModel()
+    virtual ~SpecificIncompressibleTurbulenceModel()
     {}
 
 
-    // Public Member Functions
+    // Selectors
 
-        //- Return the LES field indicator
-        virtual tmp<volScalarField> LESRegion() const = 0;
+        //- Return a reference to the selected RAS model
+        static autoPtr<SpecificIncompressibleTurbulenceModel> New
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "SpecificIncompressibleTurbulenceModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModelDoc.H b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
similarity index 94%
rename from src/turbulenceModels/incompressible/turbulenceModel/turbulenceModelDoc.H
rename to src/TurbulenceModels/incompressible/turbulenceModelDoc.H
index f9751dc54..2e5547351 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,5 +27,5 @@ License
 @{
     This group contains incompressible turbulence models.
 @}
-    
+
 \*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
similarity index 72%
rename from src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
index c23bc4b0b..aa7e9457d 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -24,10 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LamBremhorstKE.H"
+#include "wallDist.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -42,18 +42,40 @@ namespace RASModels
 defineTypeNameAndDebug(LamBremhorstKE, 0);
 addToRunTimeSelectionTable(RASModel, LamBremhorstKE, dictionary);
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void LamBremhorstKE::correctNut()
+{
+    nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 LamBremhorstKE::LamBremhorstKE
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     Cmu_
     (
@@ -96,7 +118,7 @@ LamBremhorstKE::LamBremhorstKE
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -109,7 +131,7 @@ LamBremhorstKE::LamBremhorstKE
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -126,103 +148,24 @@ LamBremhorstKE::LamBremhorstKE
     (
         sqr(scalar(1) - exp(-0.0165*(sqrt(k_)*y_/nu())))
        *(scalar(1) + 20.5/(Rt_ + SMALL))
-    ),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateLowReNut("nut", mesh_)
     )
 {
     bound(k_, kMin_);
     // already bounded: bound(epsilon_, epsilonMin_);
 
-    nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> LamBremhorstKE::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> LamBremhorstKE::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> LamBremhorstKE::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool LamBremhorstKE::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         Cmu_.readIfPresent(coeffDict());
         C1_.readIfPresent(coeffDict());
@@ -240,7 +183,7 @@ bool LamBremhorstKE::read()
 
 void LamBremhorstKE::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -293,9 +236,7 @@ void LamBremhorstKE::correct()
     solve(kEqn);
     bound(k_, kMin_);
 
-
-    // Re-calculate viscosity
-    nut_ == Cmu_*fMu_*sqr(k_)/epsilon_;
+    correctNut();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
similarity index 81%
rename from src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
index 30e590cad..4041e0452 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -39,8 +39,8 @@ SourceFiles
 #ifndef LamBremhorstKE_H
 #define LamBremhorstKE_H
 
-#include "RASModel.H"
-#include "wallDist.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,7 +57,7 @@ namespace RASModels
 
 class LamBremhorstKE
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -80,7 +80,11 @@ protected:
         volScalarField Rt_;
 
         volScalarField fMu_;
-        volScalarField nut_;
+
+
+    // Protected Member Functions
+
+        virtual void correctNut();
 
 
 public:
@@ -94,11 +98,14 @@ public:
         //- Construct from components
         LamBremhorstKE
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -109,11 +116,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -145,27 +149,8 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
similarity index 67%
rename from src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
index 4065ab267..30f7de7b5 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
@@ -24,10 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LienCubicKE.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -42,18 +41,82 @@ namespace RASModels
 defineTypeNameAndDebug(LienCubicKE, 0);
 addToRunTimeSelectionTable(RASModel, LienCubicKE, dictionary);
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void LienCubicKE::correctNut()
+{
+    nut_ =
+        Cmu_*sqr(k_)/epsilon_
+        // C5 term, implicit
+      + max
+        (
+            C5viscosity_,
+            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
+        );
+
+    nut_.correctBoundaryConditions();
+}
+
+
+void LienCubicKE::correctNonlinearStress(const volTensorField& gradU)
+{
+    nonlinearStress_ = symm
+    (
+        // quadratic terms
+        pow3(k_)/sqr(epsilon_)
+       *(
+            Ctau1_/fEta_
+           *(
+                (gradU & gradU)
+              + (gradU & gradU)().T()
+            )
+          + Ctau2_/fEta_*(gradU & gradU.T())
+          + Ctau3_/fEta_*(gradU.T() & gradU)
+        )
+        // cubic term C4
+      - 20.0*pow4(k_)/pow3(epsilon_)
+       *pow3(Cmu_)
+       *(
+            ((gradU & gradU) & gradU.T())
+          + ((gradU & gradU.T()) & gradU.T())
+          - ((gradU.T() & gradU) & gradU)
+          - ((gradU.T() & gradU.T()) & gradU)
+        )
+        // cubic term C5, explicit part
+      + min
+        (
+            C5viscosity_,
+            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
+        )*gradU
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 LienCubicKE::LienCubicKE
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    nonlinearEddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     C1_
     (
@@ -150,25 +213,25 @@ LienCubicKE::LienCubicKE
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateK("k", mesh_)
+        mesh_
     ),
     epsilon_
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateEpsilon("epsilon", mesh_)
+        mesh_
     ),
 
     eta_
@@ -182,142 +245,34 @@ LienCubicKE::LienCubicKE
        *sqrt(2.0*magSqr(0.5*(fvc::grad(U) - T(fvc::grad(U)))))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
-    fEta_(A2_ + pow(eta_, 3.0)),
+    fEta_(A2_ + pow3(eta_)),
 
     C5viscosity_
     (
-      - 2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
+       -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
        *(
             magSqr(fvc::grad(U) + T(fvc::grad(U)))
           - magSqr(fvc::grad(U) - T(fvc::grad(U)))
         )
-    ),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
-    ),
-
-    nonlinearStress_
-    (
-        "nonlinearStress",
-        // quadratic terms
-        symm
-        (
-            pow(k_, 3.0)/sqr(epsilon_)
-           *(
-                Ctau1_/fEta_
-               *(
-                    (fvc::grad(U) & fvc::grad(U))
-                  + (fvc::grad(U) & fvc::grad(U))().T()
-                )
-              + Ctau2_/fEta_*(fvc::grad(U) & T(fvc::grad(U)))
-              + Ctau3_/fEta_*(T(fvc::grad(U)) & fvc::grad(U))
-            )
-            // cubic term C4
-          - 20.0*pow(k_, 4.0)/pow(epsilon_, 3.0)
-           *pow(Cmu_, 3.0)
-           *(
-                ((fvc::grad(U) & fvc::grad(U)) & T(fvc::grad(U)))
-              + ((fvc::grad(U) & T(fvc::grad(U))) & T(fvc::grad(U)))
-              - ((T(fvc::grad(U)) & fvc::grad(U)) & fvc::grad(U))
-              - ((T(fvc::grad(U)) & T(fvc::grad(U))) & fvc::grad(U))
-            )
-        )
     )
 {
     bound(k_, kMin_);
     // already bounded: bound(epsilon_, epsilonMin_);
 
-    nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        correctNonlinearStress(fvc::grad(U));
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> LienCubicKE::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)) + nonlinearStress_,
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> LienCubicKE::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_))) + nonlinearStress_
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LienCubicKE::divDevReff(volVectorField& U) const
-{
-    return
-    (
-        fvc::div(nonlinearStress_)
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> LienCubicKE::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-        fvc::div(rho*nonlinearStress_)
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool LienCubicKE::read()
 {
-    if (RASModel::read())
+    if (nonlinearEddyViscosity<incompressible::RASModel>::read())
     {
         C1_.readIfPresent(coeffDict());
         C2_.readIfPresent(coeffDict());
@@ -341,7 +296,7 @@ bool LienCubicKE::read()
 
 void LienCubicKE::correct()
 {
-    RASModel::correct();
+    nonlinearEddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -404,38 +359,14 @@ void LienCubicKE::correct()
     eta_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU + gradU.T())));
     ksi_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU - gradU.T())));
     Cmu_ = 2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_));
-    fEta_ = A2_ + pow(eta_, 3.0);
+    fEta_ = A2_ + pow3(eta_);
 
     C5viscosity_ =
-        - 2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0)
+       -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
        *(magSqr(gradU + gradU.T()) - magSqr(gradU - gradU.T()));
 
-    nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
-    nut_.correctBoundaryConditions();
-
-    nonlinearStress_ = symm
-    (
-        // quadratic terms
-        pow(k_, 3.0)/sqr(epsilon_)*
-        (
-            Ctau1_/fEta_*
-            (
-                (gradU & gradU)
-              + (gradU & gradU)().T()
-            )
-          + Ctau2_/fEta_*(gradU & gradU.T())
-          + Ctau3_/fEta_*(gradU.T() & gradU)
-        )
-        // cubic term C4
-      - 20.0*pow(k_, 4.0)/pow(epsilon_, 3.0)
-       *pow(Cmu_, 3.0)
-       *(
-            ((gradU & gradU) & gradU.T())
-          + ((gradU & gradU.T()) & gradU.T())
-          - ((gradU.T() & gradU) & gradU)
-          - ((gradU.T() & gradU.T()) & gradU)
-        )
-    );
+    correctNut();
+    correctNonlinearStress(gradU);
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
similarity index 81%
rename from src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
index 9367a766e..411244cc7 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
@@ -38,7 +38,8 @@ SourceFiles
 #ifndef LienCubicKE_H
 #define LienCubicKE_H
 
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
+#include "nonlinearEddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,7 +56,7 @@ namespace RASModels
 
 class LienCubicKE
 :
-    public RASModel
+    public nonlinearEddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -87,9 +88,11 @@ protected:
             volScalarField fEta_;
             volScalarField C5viscosity_;
 
-            volScalarField nut_;
 
-            volSymmTensorField nonlinearStress_;
+    // Protected Member Functions
+
+        virtual void correctNut();
+        virtual void correctNonlinearStress(const volTensorField& gradU);
 
 
 public:
@@ -102,11 +105,14 @@ public:
         //- Construct from components
         LienCubicKE
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -117,11 +123,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -153,27 +156,8 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C
similarity index 69%
rename from src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 12a05b4fe..cef1ad5bf 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LienCubicKELowRe.H"
+#include "wallDist.H"
 #include "wallFvPatch.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -43,18 +43,90 @@ namespace RASModels
 defineTypeNameAndDebug(LienCubicKELowRe, 0);
 addToRunTimeSelectionTable(RASModel, LienCubicKELowRe, dictionary);
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<volScalarField> LienCubicKELowRe::fMu()
+{
+    return
+        (scalar(1) - exp(-Am_*yStar_))
+       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL);
+}
+
+
+void LienCubicKELowRe::correctNut()
+{
+    nut_ =
+        Cmu_*fMu()*sqr(k_)/epsilon_
+        // C5 term, implicit
+      + max
+        (
+            C5viscosity_,
+            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
+        );
+
+    nut_.correctBoundaryConditions();
+}
+
+
+void LienCubicKELowRe::correctNonlinearStress(const volTensorField& gradU)
+{
+    nonlinearStress_ = symm
+    (
+        // quadratic terms
+        pow3(k_)/sqr(epsilon_)
+       *(
+            Ctau1_/fEta_
+           *(
+                (gradU & gradU)
+              + (gradU & gradU)().T()
+            )
+          + Ctau2_/fEta_*(gradU & gradU.T())
+          + Ctau3_/fEta_*(gradU.T() & gradU)
+        )
+        // cubic term C4
+      - 20.0*pow4(k_)/pow3(epsilon_)
+       *pow3(Cmu_)
+       *(
+            ((gradU & gradU) & gradU.T())
+          + ((gradU & gradU.T()) & gradU.T())
+          - ((gradU.T() & gradU) & gradU)
+          - ((gradU.T() & gradU.T()) & gradU)
+        )
+        // cubic term C5, explicit part
+      + min
+        (
+            C5viscosity_,
+            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
+        )*gradU
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 LienCubicKELowRe::LienCubicKELowRe
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    nonlinearEddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     C1_
     (
@@ -196,7 +268,7 @@ LienCubicKELowRe::LienCubicKELowRe
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -209,7 +281,7 @@ LienCubicKELowRe::LienCubicKELowRe
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -235,156 +307,32 @@ LienCubicKELowRe::LienCubicKELowRe
 
     C5viscosity_
     (
-        -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
+       -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
        *(
-           magSqr(fvc::grad(U) + T(fvc::grad(U)))
-         - magSqr(fvc::grad(U) - T(fvc::grad(U)))
+            magSqr(fvc::grad(U) + T(fvc::grad(U)))
+          - magSqr(fvc::grad(U) - T(fvc::grad(U)))
         )
     ),
 
-    yStar_(sqrt(k_)*y_/nu() + SMALL),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateLowReNut("nut", mesh_)
-    ),
-
-    nonlinearStress_
-    (
-        "nonlinearStress",
-        symm
-        (
-            // quadratic terms
-            pow3(k_)/sqr(epsilon_)
-           *(
-                Ctau1_/fEta_
-               *(
-                    (fvc::grad(U) & fvc::grad(U))
-                  + (fvc::grad(U) & fvc::grad(U))().T()
-                )
-              + Ctau2_/fEta_*(fvc::grad(U) & T(fvc::grad(U)))
-              + Ctau3_/fEta_*(T(fvc::grad(U)) & fvc::grad(U))
-            )
-            // cubic term C4
-          - 20.0*pow4(k_)/pow3(epsilon_)
-           *pow3(Cmu_)
-           *(
-                ((fvc::grad(U) & fvc::grad(U)) & T(fvc::grad(U)))
-              + ((fvc::grad(U) & T(fvc::grad(U))) & T(fvc::grad(U)))
-              - ((T(fvc::grad(U)) & fvc::grad(U)) & fvc::grad(U))
-              - ((T(fvc::grad(U)) & T(fvc::grad(U))) & fvc::grad(U))
-            )
-            // cubic term C5, explicit part
-          + min
-            (
-                C5viscosity_,
-                dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
-            )*fvc::grad(U)
-        )
-    )
+    yStar_(sqrt(k_)*y_/nu() + SMALL)
 {
     bound(k_, kMin_);
     // already bounded: bound(epsilon_, epsilonMin_);
 
-    nut_ = Cmu_
-      * (scalar(1) - exp(-Am_*yStar_))
-      / (scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)
-      * sqr(k_)/epsilon_
-        // cubic term C5, implicit part
-      + max
-        (
-            C5viscosity_,
-            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
-        );
-
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        correctNonlinearStress(fvc::grad(U));
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> LienCubicKELowRe::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)) + nonlinearStress_,
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> LienCubicKELowRe::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_))) + nonlinearStress_
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LienCubicKELowRe::divDevReff(volVectorField& U) const
-{
-    return
-    (
-        fvc::div(nonlinearStress_)
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> LienCubicKELowRe::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-        fvc::div(rho*nonlinearStress_)
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool LienCubicKELowRe::read()
 {
-    if (RASModel::read())
+    if (nonlinearEddyViscosity<incompressible::RASModel>::read())
     {
         C1_.readIfPresent(coeffDict());
         C2_.readIfPresent(coeffDict());
@@ -413,7 +361,7 @@ bool LienCubicKELowRe::read()
 
 void LienCubicKELowRe::correct()
 {
-    RASModel::correct();
+    nonlinearEddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -429,11 +377,6 @@ void LienCubicKELowRe::correct()
     yStar_ = sqrt(k_)*y_/nu() + SMALL;
     tmp<volScalarField> Rt = sqr(k_)/(nu()*epsilon_);
 
-    const volScalarField fMu
-    (
-        (scalar(1) - exp(-Am_*yStar_))
-       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)
-    );
     const volScalarField f2
     (
         scalar(1) - 0.3*exp(-sqr(Rt))
@@ -442,7 +385,7 @@ void LienCubicKELowRe::correct()
     volScalarField G
     (
         GName(),
-        Cmu_*fMu*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
+        Cmu_*fMu()*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
     );
 
     // Dissipation equation
@@ -491,50 +434,14 @@ void LienCubicKELowRe::correct()
     eta_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU + gradU.T())));
     ksi_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU - gradU.T())));
     Cmu_ = 2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_));
-    fEta_ = A2_ + pow(eta_, 3.0);
+    fEta_ = A2_ + pow3(eta_);
 
     C5viscosity_ =
-      - 2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0)
+       -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
        *(magSqr(gradU + gradU.T()) - magSqr(gradU - gradU.T()));
 
-    nut_ =
-        Cmu_*fMu*sqr(k_)/epsilon_
-        // C5 term, implicit
-      + max
-        (
-            C5viscosity_,
-            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
-        );
-
-    nonlinearStress_ = symm
-    (
-        // quadratic terms
-        pow(k_, 3.0)/sqr(epsilon_)
-       *(
-            Ctau1_/fEta_
-           *(
-                (gradU & gradU)
-              + (gradU & gradU)().T()
-            )
-          + Ctau2_/fEta_*(gradU & gradU.T())
-          + Ctau3_/fEta_*(gradU.T() & gradU)
-        )
-        // cubic term C4
-      - 20.0*pow(k_, 4.0)/pow(epsilon_, 3.0)
-       *pow(Cmu_, 3.0)
-       *(
-            ((gradU & gradU) & gradU.T())
-          + ((gradU & gradU.T()) & gradU.T())
-          - ((gradU.T() & gradU) & gradU)
-          - ((gradU.T() & gradU.T()) & gradU)
-        )
-        // cubic term C5, explicit part
-      + min
-        (
-            C5viscosity_,
-            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
-        )*gradU
-    );
+    correctNut();
+    correctNonlinearStress(gradU);
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.H
similarity index 84%
rename from src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index a7dcac84c..40faf6762 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -53,8 +53,8 @@ SourceFiles
 #ifndef LienCubicKELowRe_H
 #define LienCubicKELowRe_H
 
-#include "RASModel.H"
-#include "wallDist.H"
+#include "turbulentTransportModel.H"
+#include "nonlinearEddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -71,7 +71,7 @@ namespace RASModels
 
 class LienCubicKELowRe
 :
-    public RASModel
+    public nonlinearEddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -117,9 +117,13 @@ protected:
 
             volScalarField yStar_;
 
-            volScalarField nut_;
 
-            volSymmTensorField nonlinearStress_;
+    // Protected Member Functions
+
+        tmp<volScalarField> fMu();
+
+        virtual void correctNut();
+        virtual void correctNonlinearStress(const volTensorField& gradU);
 
 
 public:
@@ -132,11 +136,14 @@ public:
         //- Construct from components
         LienCubicKELowRe
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -147,11 +154,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -183,27 +187,8 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
similarity index 100%
rename from src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
similarity index 72%
rename from src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 5b4c77477..65880a8a8 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LienLeschzinerLowRe.H"
+#include "wallDist.H"
 #include "wallFvPatch.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -43,18 +43,48 @@ namespace RASModels
 defineTypeNameAndDebug(LienLeschzinerLowRe, 0);
 addToRunTimeSelectionTable(RASModel, LienLeschzinerLowRe, dictionary);
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<volScalarField> LienLeschzinerLowRe::fMu()
+{
+    return
+        (scalar(1) - exp(-Am_*yStar_))
+       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL);
+}
+
+
+void LienLeschzinerLowRe::correctNut()
+{
+    nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 LienLeschzinerLowRe::LienLeschzinerLowRe
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     C1_
     (
@@ -142,7 +172,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -155,7 +185,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -166,107 +196,24 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
 
     y_(wallDist::New(mesh_).y()),
 
-    yStar_(sqrt(k_)*y_/nu() + SMALL),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateLowReNut("nut", mesh_)
-    )
+    yStar_(sqrt(k_)*y_/nu() + SMALL)
 {
     bound(k_, kMin_);
     bound(epsilon_, epsilonMin_);
 
-    nut_ = Cmu_*(scalar(1) - exp(-Am_*yStar_))
-       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)*sqr(k_)
-       /(epsilon_);
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> LienLeschzinerLowRe::R() const
-{
-    tmp<volTensorField> gradU = fvc::grad(U_);
-
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(gradU),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> LienLeschzinerLowRe::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LienLeschzinerLowRe::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*T(fvc::grad(U)))
-    );
-}
-
-
-tmp<fvVectorMatrix> LienLeschzinerLowRe::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool LienLeschzinerLowRe::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         C1_.readIfPresent(coeffDict());
         C2_.readIfPresent(coeffDict());
@@ -289,7 +236,7 @@ bool LienLeschzinerLowRe::read()
 
 void LienLeschzinerLowRe::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -306,15 +253,9 @@ void LienLeschzinerLowRe::correct()
     yStar_ = sqrt(k_)*y_/nu() + SMALL;
     tmp<volScalarField> Rt = sqr(k_)/(nu()*epsilon_);
 
-    volScalarField fMu
-    (
-        (scalar(1) - exp(-Am_*yStar_))
-       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)
-    );
-
     const volScalarField f2(scalar(1) - 0.3*exp(-sqr(Rt)));
 
-    volScalarField G(GName(), Cmu_*fMu*sqr(k_)/epsilon_*S2);
+    volScalarField G(GName(), Cmu_*fMu()*sqr(k_)/epsilon_*S2);
 
 
     // Dissipation equation
@@ -357,9 +298,7 @@ void LienLeschzinerLowRe::correct()
     solve(kEqn);
     bound(k_, kMin_);
 
-
-    // Re-calculate viscosity
-    nut_ = Cmu_*fMu*sqr(k_)/epsilon_;
+    correctNut();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
similarity index 82%
rename from src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index c9d664ce0..206abb09b 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -39,8 +39,8 @@ SourceFiles
 #ifndef LienLeschzinerLowRe_H
 #define LienLeschzinerLowRe_H
 
-#include "RASModel.H"
-#include "wallDist.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,7 +57,7 @@ namespace RASModels
 
 class LienLeschzinerLowRe
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -90,7 +90,12 @@ protected:
 
             volScalarField yStar_;
 
-            volScalarField nut_;
+
+    // Protected Member Functions
+
+        tmp<volScalarField> fMu();
+
+        virtual void correctNut();
 
 
 public:
@@ -102,11 +107,14 @@ public:
         //- Construct from components
         LienLeschzinerLowRe
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -117,11 +125,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -153,27 +158,8 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
similarity index 100%
rename from src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C
similarity index 71%
rename from src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index 12cbbfcd8..1dd886498 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -24,10 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "RNGkEpsilon.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -42,18 +41,40 @@ namespace RASModels
 defineTypeNameAndDebug(RNGkEpsilon, 0);
 addToRunTimeSelectionTable(RASModel, RNGkEpsilon, dictionary);
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void RNGkEpsilon::correctNut()
+{
+    nut_ = Cmu_*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 RNGkEpsilon::RNGkEpsilon
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     Cmu_
     (
@@ -123,122 +144,43 @@ RNGkEpsilon::RNGkEpsilon
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateK("k", mesh_)
+        mesh_
     ),
     epsilon_
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
+        mesh_
     )
 {
     bound(k_, kMin_);
     bound(epsilon_, epsilonMin_);
 
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-tmp<volSymmTensorField> RNGkEpsilon::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> RNGkEpsilon::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> RNGkEpsilon::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool RNGkEpsilon::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         Cmu_.readIfPresent(coeffDict());
         C1_.readIfPresent(coeffDict());
@@ -259,7 +201,7 @@ bool RNGkEpsilon::read()
 
 void RNGkEpsilon::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -286,7 +228,6 @@ void RNGkEpsilon::correct()
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
         (C1_ - R)*G*epsilon_/k_
-    //- fvm::SuSp(R*G/k_, epsilon_)
       - fvm::Sp(C2_*epsilon_/k_, epsilon_)
     );
 
@@ -313,10 +254,7 @@ void RNGkEpsilon::correct()
     solve(kEqn);
     bound(k_, kMin_);
 
-
-    // Re-calculate viscosity
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
+    correctNut();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H
similarity index 83%
rename from src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H
index caaa4f2d8..1d32e4aaa 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -60,7 +60,8 @@ SourceFiles
 #ifndef RNGkEpsilon_H
 #define RNGkEpsilon_H
 
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,7 +78,7 @@ namespace RASModels
 
 class RNGkEpsilon
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -99,7 +100,11 @@ protected:
 
             volScalarField k_;
             volScalarField epsilon_;
-            volScalarField nut_;
+
+
+    // Protected Member Functions
+
+        virtual void correctNut();
 
 
 public:
@@ -112,11 +117,14 @@ public:
         //- Construct from components
         RNGkEpsilon
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -127,11 +135,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -163,27 +168,8 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
index c24937c52..fa2652446 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,11 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
+#include "v2f.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "wallFvPatch.H"
-#include "v2f.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -174,13 +173,19 @@ void fWallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
+    const turbulenceModel& turbulence = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
     const v2f& v2fModel = refCast<const v2f>(turbulence);
 
-    const scalarField& y = v2fModel.y()[patchI];
+    const scalarField& y = v2fModel.y()[patchi];
 
     const tmp<volScalarField> tk = v2fModel.k();
     const volScalarField& k = tk();
@@ -191,8 +196,8 @@ void fWallFunctionFvPatchScalarField::updateCoeffs()
     const tmp<volScalarField> tv2 = v2fModel.v2();
     const volScalarField& v2 = tv2();
 
-    const tmp<volScalarField> tnu = v2fModel.nu();
-    const scalarField& nuw = tnu().boundaryField()[patchI];
+    const tmp<scalarField> tnuw = turbulence.nu(patchi);
+    const scalarField& nuw = tnuw();
 
     const scalar Cmu25 = pow025(Cmu_);
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
similarity index 97%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
index b5d92d942..d99d16102 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::RASModels::fWallFunctionFvPatchScalarField
+    Foam::RASModels::fWallFunctionFvPatchScalarField
 
 Group
-    grpIcoWallFunctions
+    grpWallFunctions
 
 Description
     This boundary condition provides a turbulence damping function, f, wall
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
index 19ae103d7..c2df8e4a9 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "v2WallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
+#include "turbulenceModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -173,17 +173,23 @@ void v2WallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbulence.y()[patchI];
+    const turbulenceModel& turbulence = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
+    const scalarField& y = turbulence.y()[patchi];
 
     const tmp<volScalarField> tk = turbulence.k();
     const volScalarField& k = tk();
 
-    const tmp<volScalarField> tnu = turbulence.nu();
-    const scalarField& nuw = tnu().boundaryField()[patchI];
+    const tmp<scalarField> tnuw = turbulence.nu(patchi);
+    const scalarField& nuw = tnuw();
 
     const scalar Cmu25 = pow025(Cmu_);
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
similarity index 97%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
index a0a8cde8e..e4e8fdafa 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::RASModels::v2WallFunctionFvPatchScalarField
+    Foam::RASModels::v2WallFunctionFvPatchScalarField
 
 Group
-    grpIcoWallFunctions
+    grpWallFunctions
 
 Description
     This boundary condition provides a turbulence stress normal to streamlines
diff --git a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/nonLinearWallFunctionsI.H
similarity index 98%
rename from src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/nonLinearWallFunctionsI.H
index 90b21921b..46bf81176 100644
--- a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/nonLinearWallFunctionsI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallDissipationI.H
similarity index 95%
rename from src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallDissipationI.H
index 3e60bffec..a51933362 100644
--- a/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallDissipationI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallNonlinearViscosityI.H
similarity index 97%
rename from src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallNonlinearViscosityI.H
index 6b1080d2a..b6936b49c 100644
--- a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallNonlinearViscosityI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes
new file mode 100644
index 000000000..51cb377b0
--- /dev/null
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes
@@ -0,0 +1,144 @@
+turbulenceModelName -> propertiesName
+modelName -> type
+
+* Header
+*** Includes
+    - Remove
+    #include "RASModel.H"
+    + Add
+    #include "turbulentTransportModel.H"
+    #include "eddyViscosity.H"
+*** Base class
+    - Change
+    RASModel -> eddyViscosity<RASModel>
+*** Protected data
+    - Remove
+    volScalarField nut_;
+*** Constructor
+    + Add
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
+            .
+            const surfaceScalarField& alphaRhoPhi,
+
+*** Private member functions
+    + Add
+    // Protected Member Functions
+
+        virtual void correctNut();
+
+*** Member functions
+    - Remove
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> nut() const
+        {
+            return nut_;
+        }
+
+        //- Return the Reynolds stress tensor
+        virtual tmp<volSymmTensorField> R() const;
+
+        //- Return the effective stress tensor including the laminar stress
+        virtual tmp<volSymmTensorField> devReff() const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevRhoReff
+        (
+            const volScalarField& rho,
+            volVectorField& U
+        ) const;
+
+    + Move to top
+        //- Read RASProperties dictionary
+        virtual bool read();
+
+* Source
+*** Includes
+    + Add
+      #include "bound.H"
+    - Remove
+      #include "backwardsCompatibilityWallFunctions.H"
+*** Constructor
+    + Add arguments
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
+            .
+            const surfaceScalarField& alphaRhoPhi,
+    + Replace
+    RASModel(modelName, U, phi, transport, turbulenceModelName),
+      with
+    eddyViscosity<RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+    + Replace
+    autoCreate.*mesh_) -> mesh_
+    NO_READ -> MUST_READ
+    - Remove
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
+    + Replace
+    nut_ = k_/omega_;
+    nut_.correctBoundaryConditions();
+
+    printCoeffs();
+
+    with
+
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
+*** Member functions
+    + Move read to top
+    + Add after read
+void kOmega::correctNut()
+{
+    ....
+    nut_.correctBoundaryConditions();
+}
+    - Remove
+        //- Return the Reynolds stress tensor
+        virtual tmp<volSymmTensorField> R() const;
+
+        //- Return the effective stress tensor including the laminar stress
+        virtual tmp<volSymmTensorField> devReff() const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevRhoReff
+        (
+            const volScalarField& rho,
+            volVectorField& U
+        ) const;
+
+*** correct()
+    - Replace
+    // Re-calculate viscosity
+    nut_ = Cmu_*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
+    with
+    correctNut();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.C
similarity index 68%
rename from src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.C
index 8394f986e..12a95d07f 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.C
@@ -24,10 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kOmega.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -42,18 +41,40 @@ namespace RASModels
 defineTypeNameAndDebug(kOmega, 0);
 addToRunTimeSelectionTable(RASModel, kOmega, dictionary);
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void kOmega::correctNut()
+{
+    nut_ = k_/omega_;
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 kOmega::kOmega
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     Cmu_
     (
@@ -105,121 +126,43 @@ kOmega::kOmega
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateK("k", mesh_)
+        mesh_
     ),
     omega_
     (
         IOobject
         (
-            "omega",
+            IOobject::groupName("omega", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateOmega("omega", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
+        mesh_
     )
 {
     bound(k_, kMin_);
     bound(omega_, omegaMin_);
 
-    nut_ = k_/omega_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> kOmega::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> kOmega::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> kOmega::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> kOmega::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool kOmega::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         Cmu_.readIfPresent(coeffDict());
         beta_.readIfPresent(coeffDict());
@@ -237,7 +180,7 @@ bool kOmega::read()
 
 void kOmega::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -283,10 +226,7 @@ void kOmega::correct()
     solve(kEqn);
     bound(k_, kMin_);
 
-
-    // Re-calculate viscosity
-    nut_ = k_/omega_;
-    nut_.correctBoundaryConditions();
+    correctNut();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.H
similarity index 84%
rename from src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.H
index f2c091305..a0b6b732c 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.H
@@ -62,7 +62,8 @@ SourceFiles
 #ifndef kOmega_H
 #define kOmega_H
 
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -79,7 +80,7 @@ namespace RASModels
 
 class kOmega
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -99,7 +100,11 @@ protected:
 
             volScalarField k_;
             volScalarField omega_;
-            volScalarField nut_;
+
+
+    // Protected Member Functions
+
+        virtual void correctNut();
 
 
 public:
@@ -107,16 +112,20 @@ public:
     //- Runtime type information
     TypeName("kOmega");
 
+
     // Constructors
 
         //- Construct from components
         kOmega
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -127,11 +136,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -182,27 +188,8 @@ public:
             );
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
similarity index 87%
rename from src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
index b7e8231ca..a32ce3b4a 100644
--- a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
@@ -24,10 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kkLOmega.H"
+#include "bound.H"
+#include "wallDist.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -42,7 +42,7 @@ namespace RASModels
 defineTypeNameAndDebug(kkLOmega, 0);
 addToRunTimeSelectionTable(RASModel, kkLOmega, dictionary);
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 tmp<volScalarField> kkLOmega::fv(const volScalarField& Ret) const
 {
@@ -200,18 +200,40 @@ tmp<volScalarField> kkLOmega::gammaNAT
 }
 
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void kkLOmega::correctNut()
+{
+    nut_ = kt_/omega_;
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 kkLOmega::kkLOmega
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     A0_
     (
@@ -460,49 +482,37 @@ kkLOmega::kkLOmega
     (
         IOobject
         (
-            "kt",
+            IOobject::groupName("kt", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateK("kt", mesh_)
+        mesh_
     ),
     omega_
     (
         IOobject
         (
-            "omega",
+            IOobject::groupName("omega", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateOmega("omega", mesh_)
+        mesh_
     ),
     kl_
     (
         IOobject
         (
-            "kl",
+            IOobject::groupName("kl", U.group()),
             runTime_.timeName(),
             mesh_,
-            IOobject::NO_READ,
+            IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        autoCreateK("kl", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
+        mesh_
     ),
     y_(wallDist::New(mesh_).y())
 {
@@ -510,85 +520,22 @@ kkLOmega::kkLOmega
     bound(kl_, kMin_);
     bound(omega_, omegaMin_);
 
-    nut_ = kt_/(omega_ + omegaMin_);
-    nut_.correctBoundaryConditions();
+    if (type == typeName)
+    {
+        // This is only an approximate nut, so only good for initialization
+        // not restart
+        // correctNut();
 
-    printCoeffs();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> kkLOmega::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*(kt_) - nut_*twoSymm(fvc::grad(U_)),
-            kt_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> kkLOmega::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> kkLOmega::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> kkLOmega::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool kkLOmega::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         A0_.readIfPresent(coeffDict());
         As_.readIfPresent(coeffDict());
@@ -630,7 +577,7 @@ bool kkLOmega::read()
 
 void kkLOmega::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -641,7 +588,6 @@ void kkLOmega::correct()
     const volScalarField kT(kt_ + kl_);
 
     const volScalarField lambdaT(sqrt(kT)/(omega_ + omegaMin_));
-
     const volScalarField lambdaEff(min(Clambda_*y_, lambdaT));
 
     const volScalarField fw
@@ -650,9 +596,7 @@ void kkLOmega::correct()
     );
 
     const volTensorField gradU(fvc::grad(U_));
-
     const volScalarField omega(sqrt(2.0)*mag(skew(gradU)));
-
     const volScalarField S2(2.0*magSqr(symm(gradU)));
 
     const volScalarField ktS(fSS(omega)*fw*kt_);
@@ -663,6 +607,7 @@ void kkLOmega::correct()
        *fINT()
        *Cmu(sqrt(S2))*sqrt(ktS)*lambdaEff
     );
+
     const volScalarField Pkt(nuts*S2);
 
     const volScalarField ktL(kt_ - ktS);
@@ -674,7 +619,7 @@ void kkLOmega::correct()
             C11_*fTaul(lambdaEff, ktL)*omega*sqr(lambdaEff)
           * sqrt(ktL)*lambdaEff/nu()
           + C12_*BetaTS(ReOmega)*ReOmega*sqr(y_)*omega
-        ,
+          ,
             0.5*(kl_ + ktL)/sqrt(S2)
         )
     );
@@ -748,6 +693,7 @@ void kkLOmega::correct()
 
 
     omega_.boundaryField().updateCoeffs();
+
     // Turbulence specific dissipation rate equation
     tmp<fvScalarMatrix> omegaEqn
     (
diff --git a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
similarity index 89%
rename from src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
index 65a14ce35..0b45136b8 100644
--- a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
@@ -80,8 +80,8 @@ SourceFiles
 #ifndef kkLOmega_H
 #define kkLOmega_H
 
-#include "RASModel.H"
-#include "wallDist.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -98,7 +98,7 @@ namespace RASModels
 
 class kkLOmega
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
     // Private memmber functions
 
@@ -180,7 +180,6 @@ protected:
             volScalarField kt_;
             volScalarField omega_;
             volScalarField kl_;
-            volScalarField nut_;
 
             //- Wall distance
             //  Note: different to wall distance in parent RASModel
@@ -188,21 +187,30 @@ protected:
             const volScalarField& y_;
 
 
+    // Protected Member Functions
+
+        virtual void correctNut();
+
+
 public:
 
     //- Runtime type information
     TypeName("kkLOmega");
 
+
     // Constructors
 
         //- Construct from components
         kkLOmega
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -213,11 +221,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff(const volScalarField& alphaT) const
@@ -274,27 +279,8 @@ public:
             );
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
similarity index 73%
rename from src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
index 5883278c6..20c71af7b 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
@@ -23,10 +23,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NonlinearKEShih.H"
-#include "addToRunTimeSelectionTable.H"
+#include "nonlinearKEShih.H"
+#include "bound.H"
 #include "wallFvPatch.H"
 #include "nutkWallFunctionFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,21 +40,61 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(NonlinearKEShih, 0);
-addToRunTimeSelectionTable(RASModel, NonlinearKEShih, dictionary);
+defineTypeNameAndDebug(nonlinearKEShih, 0);
+addToRunTimeSelectionTable(RASModel, nonlinearKEShih, dictionary);
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void nonlinearKEShih::correctNut()
+{
+    nut_ = Cmu_*sqr(k_)/epsilon_;
+    #include "wallNonlinearViscosityI.H"
+}
+
+
+void nonlinearKEShih::correctNonlinearStress(const volTensorField& gradU)
+{
+    nonlinearStress_ = symm
+    (
+        pow(k_, 3.0)/sqr(epsilon_)
+       *(
+            Ctau1_/fEta_
+           *(
+                (gradU & gradU)
+              + (gradU & gradU)().T()
+            )
+          + Ctau2_/fEta_*(gradU & T(gradU))
+          + Ctau3_/fEta_*(T(gradU) & gradU)
+        )
+    );
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-NonlinearKEShih::NonlinearKEShih
+nonlinearKEShih::nonlinearKEShih
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    nonlinearEddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     C1_
     (
@@ -169,7 +210,7 @@ NonlinearKEShih::NonlinearKEShih
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -182,7 +223,7 @@ NonlinearKEShih::NonlinearKEShih
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -202,111 +243,25 @@ NonlinearKEShih::NonlinearKEShih
        *sqrt(2.0*magSqr(0.5*(fvc::grad(U) - T(fvc::grad(U)))))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
-    fEta_(A2_ + pow(eta_, 3.0)),
-
-    nut_("nut", Cmu_*sqr(k_)/epsilon_),
-
-    nonlinearStress_
-    (
-        "nonlinearStress",
-        symm
-        (
-            pow3(k_)/sqr(epsilon_)
-           *(
-                Ctau1_/fEta_
-               *(
-                    (fvc::grad(U) & fvc::grad(U))
-                  + (fvc::grad(U) & fvc::grad(U))().T()
-                )
-              + Ctau2_/fEta_*(fvc::grad(U) & T(fvc::grad(U)))
-              + Ctau3_/fEta_*(T(fvc::grad(U)) & fvc::grad(U))
-            )
-        )
-    )
+    fEta_(A2_ + pow(eta_, 3.0))
 {
     bound(k_, kMin_);
     // already bounded: bound(epsilon_, epsilonMin_);
 
-    #include "wallNonlinearViscosityI.H"
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        correctNonlinearStress(fvc::grad(U));
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> NonlinearKEShih::R() const
+bool nonlinearKEShih::read()
 {
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)) + nonlinearStress_,
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> NonlinearKEShih::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_))) + nonlinearStress_
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> NonlinearKEShih::divDevReff(volVectorField& U) const
-{
-    return
-    (
-        fvc::div(nonlinearStress_)
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> NonlinearKEShih::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-        fvc::div(rho*nonlinearStress_)
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool NonlinearKEShih::read()
-{
-    if (RASModel::read())
+    if (nonlinearEddyViscosity<incompressible::RASModel>::read())
     {
         C1_.readIfPresent(coeffDict());
         C2_.readIfPresent(coeffDict());
@@ -331,9 +286,9 @@ bool NonlinearKEShih::read()
 }
 
 
-void NonlinearKEShih::correct()
+void nonlinearKEShih::correct()
 {
-    RASModel::correct();
+    nonlinearEddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -397,23 +352,8 @@ void NonlinearKEShih::correct()
     Cmu_ = 2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_));
     fEta_ = A2_ + pow(eta_, 3.0);
 
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-
-    #include "wallNonlinearViscosityI.H"
-
-    nonlinearStress_ = symm
-    (
-        pow(k_, 3.0)/sqr(epsilon_)
-       *(
-            Ctau1_/fEta_
-           *(
-                (gradU & gradU)
-              + (gradU & gradU)().T()
-            )
-          + Ctau2_/fEta_*(gradU & T(gradU))
-          + Ctau3_/fEta_*(T(gradU) & gradU)
-        )
-    );
+    correctNut();
+    correctNonlinearStress(gradU);
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H
similarity index 76%
rename from src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H
index 10d51669b..9037328e6 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::RASModels::NonlinearKEShih
+    Foam::incompressible::RASModels::nonlinearKEShih
 
 Group
     grpIcoRASTurbulence
@@ -32,14 +32,15 @@ Description
     incompressible flows
 
 SourceFiles
-    NonlinearKEShih.C
+    nonlinearKEShih.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NonlinearKEShih_H
-#define NonlinearKEShih_H
+#ifndef nonlinearKEShih_H
+#define nonlinearKEShih_H
 
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
+#include "nonlinearEddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,12 +52,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class NonlinearKEShih Declaration
+                      Class nonlinearKEShih Declaration
 \*---------------------------------------------------------------------------*/
 
-class NonlinearKEShih
+class nonlinearKEShih
 :
-    public RASModel
+    public nonlinearEddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -90,41 +91,44 @@ protected:
             volScalarField Cmu_;
             volScalarField fEta_;
 
-            volScalarField nut_;
 
-            volSymmTensorField nonlinearStress_;
+    // Protected Member Functions
+
+        virtual void correctNut();
+        virtual void correctNonlinearStress(const volTensorField& gradU);
 
 
 public:
 
     //- Runtime type information
-    TypeName("NonlinearKEShih");
+    TypeName("nonlinearKEShih");
+
 
     // Constructors
 
         //- Construct from components
-        NonlinearKEShih
+        nonlinearKEShih
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
     //- Destructor
-    virtual ~NonlinearKEShih()
+    virtual ~nonlinearKEShih()
     {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -156,27 +160,8 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
similarity index 72%
rename from src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
index c6b20e54f..7d62a6259 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
@@ -24,10 +24,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "qZeta.H"
+#include "bound.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "backwardsCompatibilityWallFunctions.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -68,18 +67,38 @@ tmp<volScalarField> qZeta::f2() const
 }
 
 
+void qZeta::correctNut()
+{
+    nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 qZeta::qZeta
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     Cmu_
     (
@@ -127,14 +146,14 @@ qZeta::qZeta
         )
     ),
 
-    qMin_("qMin", dimVelocity, SMALL),
-    zetaMin_("zetaMin", dimVelocity/dimTime, SMALL),
+    qMin_("qMin", sqrt(kMin_)),
+    zetaMin_("zetaMin", epsilonMin_/(2*qMin_)),
 
     k_
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -147,7 +166,7 @@ qZeta::qZeta
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -160,13 +179,13 @@ qZeta::qZeta
     (
         IOobject
         (
-            "q",
+            IOobject::groupName("q", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        sqrt(k_),
+        sqrt(bound(k_, kMin_)),
         k_.boundaryField().types()
     ),
 
@@ -174,113 +193,31 @@ qZeta::qZeta
     (
         IOobject
         (
-            "zeta",
+            IOobject::groupName("zeta", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        epsilon_/(2.0*bound(q_, qMin_)),
+        bound(epsilon_, epsilonMin_)/(2.0*q_),
         epsilon_.boundaryField().types()
-    ),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
     )
 {
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-    // already bounded: bound(q_, qMin_);
     bound(zeta_, zetaMin_);
 
-    nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> qZeta::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> qZeta::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> qZeta::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> qZeta::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool qZeta::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         Cmu_.readIfPresent(coeffDict());
         C1_.readIfPresent(coeffDict());
@@ -302,7 +239,7 @@ bool qZeta::read()
 
 void qZeta::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -356,10 +293,7 @@ void qZeta::correct()
     epsilon_ = 2*q_*zeta_;
     epsilon_.correctBoundaryConditions();
 
-
-    // Re-calculate viscosity
-    nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
+    correctNut();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
similarity index 75%
rename from src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
index dc9e1f6b5..9393e0237 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
@@ -52,7 +52,8 @@ SourceFiles
 #ifndef qZeta_H
 #define qZeta_H
 
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,7 +70,7 @@ namespace RASModels
 
 class qZeta
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -98,13 +99,12 @@ protected:
             volScalarField q_;
             volScalarField zeta_;
 
-            volScalarField nut_;
-
 
     // Protected Member Functions
 
         tmp<volScalarField> fMu() const;
         tmp<volScalarField> f2() const;
+        virtual void correctNut();
 
 
 public:
@@ -117,11 +117,14 @@ public:
         //- Construct from components
         qZeta
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -132,37 +135,31 @@ public:
 
     // Member Functions
 
-       // Access
+        //- Read RASProperties dictionary
+        virtual bool read();
 
-            //- Return the lower allowable limit for q (default: SMALL)
-            const dimensionedScalar& qMin() const
-            {
-                return qMin_;
-            }
-
-            //- Return the lower allowable limit for zeta (default: SMALL)
-            const dimensionedScalar& zetaMin() const
-            {
-                return zetaMin_;
-            }
-
-            //- Allow qMin to be changed
-            dimensionedScalar& qMin()
-            {
-                return qMin_;
-            }
-
-            //- Allow zetaMin to be changed
-            dimensionedScalar& zetaMin()
-            {
-                return zetaMin_;
-            }
-
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
+        //- Return the lower allowable limit for q (default: SMALL)
+        const dimensionedScalar& qMin() const
         {
-            return nut_;
+            return qMin_;
+        }
+
+        //- Return the lower allowable limit for zeta (default: SMALL)
+        const dimensionedScalar& zetaMin() const
+        {
+            return zetaMin_;
+        }
+
+        //- Allow qMin to be changed
+        dimensionedScalar& qMin()
+        {
+            return qMin_;
+        }
+
+        //- Allow zetaMin to be changed
+        dimensionedScalar& zetaMin()
+        {
+            return zetaMin_;
         }
 
         //- Return the effective diffusivity for q
@@ -195,9 +192,6 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
         virtual const volScalarField& q() const
         {
             return q_;
@@ -208,24 +202,8 @@ public:
             return zeta_;
         }
 
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.C
similarity index 74%
rename from src/turbulenceModels/incompressible/RAS/v2f/v2f.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.C
index 8b5ad858d..5ad491497 100644
--- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "v2f.H"
+#include "bound.H"
 #include "fixedValueFvPatchField.H"
 #include "zeroGradientFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"
@@ -44,37 +45,6 @@ addToRunTimeSelectionTable(RASModel, v2f, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-wordList v2f::RBoundaryTypes() const
-{
-    const volScalarField::GeometricBoundaryField& bf(k_.boundaryField());
-
-    wordList bTypes
-    (
-        bf.size(),
-        zeroGradientFvPatchField<symmTensor>::typeName
-    );
-
-    forAll(bf, patchI)
-    {
-        if (bf[patchI].fixesValue())
-        {
-            bTypes[patchI] = fixedValueFvPatchField<symmTensor>::typeName;
-        }
-    }
-
-    return bTypes;
-}
-
-
-tmp<volScalarField> v2f::davidsonCorrectNut
-(
-    const tmp<volScalarField>& value
-) const
-{
-    return min(CmuKEps_*sqr(k_)/epsilon_, value);
-}
-
-
 tmp<volScalarField> v2f::Ts() const
 {
     return max(k_/epsilon_, 6.0*sqrt(nu()/epsilon_));
@@ -87,18 +57,38 @@ tmp<volScalarField> v2f::Ls() const
 }
 
 
+void v2f::correctNut()
+{
+    nut_ = min(CmuKEps_*sqr(k_)/epsilon_, Cmu_*v2_*Ts());
+    nut_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 v2f::v2f
 (
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
+    eddyViscosity<incompressible::RASModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
 
     Cmu_
     (
@@ -186,7 +176,7 @@ v2f::v2f
     (
         IOobject
         (
-            "k",
+            IOobject::groupName("k", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -198,7 +188,7 @@ v2f::v2f
     (
         IOobject
         (
-            "epsilon",
+            IOobject::groupName("epsilon", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -210,7 +200,7 @@ v2f::v2f
     (
         IOobject
         (
-            "v2",
+            IOobject::groupName("v2", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -222,19 +212,7 @@ v2f::v2f
     (
         IOobject
         (
-            "f",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
+            IOobject::groupName("f", U.group()),
             runTime_.timeName(),
             mesh_,
             IOobject::MUST_READ,
@@ -250,85 +228,19 @@ v2f::v2f
     bound(v2_, v2Min_);
     bound(f_, fMin_);
 
-    nut_ = davidsonCorrectNut(Cmu_*v2_*Ts());
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
+    if (type == typeName)
+    {
+        correctNut();
+        printCoeffs(type);
+    }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> v2f::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            RBoundaryTypes()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> v2f::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> v2f::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> v2f::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
 bool v2f::read()
 {
-    if (RASModel::read())
+    if (eddyViscosity<incompressible::RASModel>::read())
     {
         Cmu_.readIfPresent(coeffDict());
         CmuKEps_.readIfPresent(coeffDict());
@@ -351,7 +263,7 @@ bool v2f::read()
 
 void v2f::correct()
 {
-    RASModel::correct();
+    eddyViscosity<incompressible::RASModel>::correct();
 
     if (!turbulence_)
     {
@@ -373,7 +285,6 @@ void v2f::correct()
         1.0/T*((C1_ - N)*v2_ - 2.0/3.0*k_*(C1_ - 1.0))
     );
 
-
     tmp<volScalarField> Ceps1 =
         1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0)));
 
@@ -444,10 +355,7 @@ void v2f::correct()
     solve(v2Eqn);
     bound(v2_, v2Min_);
 
-
-    // Re-calculate viscosity
-    nut_ = davidsonCorrectNut(Cmu_*v2_*T);
-    nut_.correctBoundaryConditions();
+    correctNut();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.H
similarity index 77%
rename from src/turbulenceModels/incompressible/RAS/v2f/v2f.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.H
index 04b0fcde0..4d1fdc33f 100644
--- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.H
@@ -31,9 +31,11 @@ Description
     Lien and Kalitzin's v2-f turbulence model for incompressible flows, with
     a limit imposed on the turbulent viscosity given by Davidson et al.
 
-    The model solves for turbulence k and epsilon, with additional equations
-    for the turbulence stress normal to streamlines, v2, and elliptic damping
-    function, f.  The variant implemented employs N=6, such that f=0 on walls.
+    The model solves for turbulence kinetic energy k and turbulence dissipation
+    rate epsilon, with additional equations for the turbulence stress normal to
+    streamlines, v2, and elliptic damping function, f.
+
+    The variant implemented employs N=6, such that f=0 on walls.
 
     Wall boundary conditions are:
 
@@ -49,15 +51,17 @@ Description
         v2      = 2/3 k
         f       = zero-gradient
 
-
     References:
+    \verbatim
+        Lien F-S, Kalitzin G,
+        "Computations of transonic flow with the v2-f turbulence model",
+        Int. J. Heat Fluid Flow 22, 2001, pp 53-61
 
-    Lien F-S, Kalitzin G, 2001.  Computations of transonic flow with the v2-f
-    turbulence model. Int. J. Heat Fluid Flow 22, pp 53-61
-
-    Davidson L, Nielsen P, Sveningsson A, 2003.  Modifications of the v2-f
-    model for computing the flow in a 3D wall jet.  Turbulence, Heat and Mass
-    Transfer 4, pp 577-584
+        Davidson L, Nielsen P, Sveningsson A,
+        "Modifications of the v2-f model for computing the flow in a
+         3D wall jet",
+        Turbulence, Heat and Mass Transfer 4, 2003, pp 577-584
+    \endverbatim
 
     The default model coefficients are given as:
     \verbatim
@@ -81,7 +85,7 @@ Note
     k variants (nutk...) for this case will not behave correctly.
 
 SeeAlso
-    Foam::kEpsilon
+    Foam::incompressible::RASModels::kEpsilon
     Foam::kLowReWallFunctionFvPatchScalarField
     Foam::epsilonLowReWallFunctionFvPatchScalarField
     Foam::v2WallFunctionFvPatchScalarField
@@ -95,7 +99,8 @@ SourceFiles
 #ifndef v2f_H
 #define v2f_H
 
-#include "RASModel.H"
+#include "turbulentTransportModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -112,7 +117,7 @@ namespace RASModels
 
 class v2f
 :
-    public RASModel
+    public eddyViscosity<incompressible::RASModel>
 {
 
 protected:
@@ -146,9 +151,6 @@ protected:
             //- Damping function
             volScalarField f_;
 
-            //- Turbulence viscosity
-            volScalarField nut_;
-
 
         // Bounding values
 
@@ -158,14 +160,7 @@ protected:
 
     // Protected Member Functions
 
-        //- Return boundary type names for the R field
-        wordList RBoundaryTypes() const;
-
-        //- Apply Davidson correction to nut
-        tmp<volScalarField> davidsonCorrectNut
-        (
-            const tmp<volScalarField>& value
-        ) const;
+        virtual void correctNut();
 
         //- Return time scale, Ts
         tmp<volScalarField> Ts() const;
@@ -184,11 +179,14 @@ public:
         //- Construct from components
         v2f
         (
+            const geometricOneField& alpha,
+            const geometricOneField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -199,11 +197,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
@@ -247,27 +242,8 @@ public:
             return f_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
similarity index 93%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index f311165eb..46051f0a6 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "alphatJayatillekeWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "turbulenceModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "wallFvPatch.H"
@@ -202,14 +202,22 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
     const label patchi = patch().index();
 
     // Retrieve turbulence properties from model
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
+
+    const turbulenceModel& turbulence = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
+
     const scalar Cmu25 = pow(Cmu_, 0.25);
-    const scalarField& y = turbModel.y()[patchi];
-    const tmp<volScalarField> tnu = turbModel.nu();
+    const scalarField& y = turbulence.y()[patchi];
+    const tmp<volScalarField> tnu = turbulence.nu();
     const volScalarField& nu = tnu();
     const scalarField& nuw = nu.boundaryField()[patchi];
-    const tmp<volScalarField> tk = turbModel.k();
+    const tmp<volScalarField> tk = turbulence.k();
     const volScalarField& k = tk();
 
     const IOdictionary& transportProperties =
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
similarity index 98%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
index f4064c4ef..b4a9005ff 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
similarity index 58%
rename from src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
index 946f45d07..72818e7f3 100644
--- a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,27 +21,52 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::incompressible::turbulenceModel
+
+Typedef
+    Foam::incompressible::RASModel
+
+Typedef
+    Foam::incompressible::LESModel
+
+Description
+    Typedefs for turbulence, RAS and LES models for incompressible flow
+    based on the standard laminar transport package.
+
+SourceFiles
+    turbulentTransportModels.C
+
 \*---------------------------------------------------------------------------*/
 
-#ifndef porousBafflePressureFvPatchFieldsFwd_H
-#define porousBafflePressureFvPatchFieldsFwd_H
+#ifndef turbulentTransportModel_H
+#define turbulentTransportModel_H
 
-#include "fieldTypes.H"
+#include "SpecificIncompressibleTurbulenceModel.H"
+#include "RASModel.H"
+#include "LESModel.H"
+#include "incompressible/transportModel/transportModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    namespace incompressible
+    {
+        typedef IncompressibleTurbulenceModel<transportModel> turbulenceModel;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+        typedef SpecificIncompressibleTurbulenceModel
+        <
+            RASModel<turbulenceModel>
+        > RASModel;
 
-template<class Type> class porousBafflePressureFvPatchField;
+        typedef SpecificIncompressibleTurbulenceModel
+        <
+            LESModel<turbulenceModel>
+        > LESModel;
+    }
+}
 
-makePatchTypeFieldTypedefs(porousBafflePressure);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModels.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
similarity index 82%
rename from src/TurbulenceModels/incompressible/incompressibleTurbulenceModels.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
index 361c6f4b7..c97c42fdb 100644
--- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModels.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "IncompressibleTurbulenceModel.H"
-#include "transportModel.H"
+#include "incompressible/transportModel/transportModel.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
@@ -49,9 +49,15 @@ makeBaseTurbulenceModel
     makeTemplatedTurbulenceModel                                               \
     (transportModelIncompressibleTurbulenceModel, LES, Type)
 
+#include "SpalartAllmaras.H"
+makeRASModel(SpalartAllmaras);
+
 #include "kEpsilon.H"
 makeRASModel(kEpsilon);
 
+#include "LaunderSharmaKE.H"
+makeRASModel(LaunderSharmaKE);
+
 #include "kOmegaSST.H"
 makeRASModel(kOmegaSST);
 
@@ -61,5 +67,14 @@ makeLESModel(Smagorinsky);
 #include "kEqn.H"
 makeLESModel(kEqn);
 
+#include "SpalartAllmarasDES.H"
+makeLESModel(SpalartAllmarasDES);
+
+#include "SpalartAllmarasDDES.H"
+makeLESModel(SpalartAllmarasDDES);
+
+#include "SpalartAllmarasIDDES.H"
+makeLESModel(SpalartAllmarasIDDES);
+
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
index 35af8e742..a09689d06 100644
--- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class TransportModel>
 Foam::PhaseCompressibleTurbulenceModel<TransportModel>::
 PhaseCompressibleTurbulenceModel
 (
+    const word& type,
     const volScalarField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
index d39949c9d..7ebabf307 100644
--- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,6 +72,7 @@ public:
         //- Construct
         PhaseCompressibleTurbulenceModel
         (
+            const word& type,
             const alphaField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
index 163318083..25539ac16 100644
--- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ template<class TransportModel>
 Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::
 PhaseIncompressibleTurbulenceModel
 (
+    const word& type,
     const volScalarField& alpha,
     const geometricOneField& rho,
     const volVectorField& U,
diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
index 836deaaa4..fb4ee56c3 100644
--- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,6 +72,7 @@ public:
         //- Construct
         PhaseIncompressibleTurbulenceModel
         (
+            const word& type,
             const alphaField& alpha,
             const geometricOneField& rho,
             const volVectorField& U,
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 11ab976a8..c3586574b 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
 :
     BasicTurbulenceModel
     (
+        type,
         alpha,
         rho,
         U,
@@ -84,7 +85,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
         LESdelta::New
         (
             IOobject::groupName("delta", U.group()),
-            U.mesh(),
+            *this,
             LESDict_
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
similarity index 60%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
rename to src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
index e7c459b88..301638dd5 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
@@ -30,20 +30,24 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace LESModels
 {
     defineTypeNameAndDebug(IDDESDelta, 0);
     addToRunTimeSelectionTable(LESdelta, IDDESDelta, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::IDDESDelta::calcDelta()
+void Foam::LESModels::IDDESDelta::calcDelta()
 {
-    const volScalarField& hmax = hmax_();
+    const volScalarField& hmax = hmax_;
+    const fvMesh& mesh = turbulenceModel_.mesh();
 
-    // Wall-reflection vectors
-    const volVectorField& n = wallDist::New(mesh()).n();
+    // Wall-normal vectors
+    const volVectorField& n = wallDist::New(mesh).n();
 
     tmp<volScalarField> tfaceToFacenMax
     (
@@ -52,46 +56,50 @@ void Foam::IDDESDelta::calcDelta()
             IOobject
             (
                 "faceToFaceMax",
-                mesh().time().timeName(),
-                mesh(),
+                mesh.time().timeName(),
+                mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            mesh(),
-            dimensionedScalar("zrero", dimLength, 0.0)
+            mesh,
+            dimensionedScalar("zero", dimLength, 0.0)
         )
     );
 
     scalarField& faceToFacenMax = tfaceToFacenMax().internalField();
 
-    const cellList& cells = mesh().cells();
-    const vectorField& faceCentres = mesh().faceCentres();
+    const cellList& cells = mesh.cells();
+    const vectorField& faceCentres = mesh.faceCentres();
 
-    forAll(cells, cellI)
+    forAll(cells, celli)
     {
-        scalar deltaMaxTmp = 0.0;
-        const labelList& cFaces = cells[cellI];
-        const vector nCell = n[cellI];
-        forAll(cFaces, cFaceI)
+        scalar maxDelta = 0.0;
+        const labelList& cFaces = cells[celli];
+        const vector nci = n[celli];
+
+        forAll(cFaces, cFacei)
         {
-            label faceI = cFaces[cFaceI];
-            const point& faceCentreI = faceCentres[faceI];
-            forAll(cFaces, cFaceJ)
+            label facei = cFaces[cFacei];
+            const point& fci = faceCentres[facei];
+
+            forAll(cFaces, cFacej)
             {
-                label faceJ = cFaces[cFaceJ];
-                const point& faceCentreJ = faceCentres[faceJ];
-                scalar tmp = (faceCentreJ - faceCentreI) & nCell;
-                if (tmp > deltaMaxTmp)
+                label facej = cFaces[cFacej];
+                const point& fcj = faceCentres[facej];
+                scalar ndfc = nci & (fcj - fci);
+
+                if (ndfc > maxDelta)
                 {
-                    deltaMaxTmp = tmp;
+                    maxDelta = ndfc;
                 }
             }
         }
-        faceToFacenMax[cellI] = deltaMaxTmp;
+
+        faceToFacenMax[celli] = maxDelta;
     }
 
 
-    label nD = mesh().nGeometricD();
+    label nD = mesh.nGeometricD();
 
     if (nD == 2)
     {
@@ -106,15 +114,14 @@ void Foam::IDDESDelta::calcDelta()
     }
 
     delta_.internalField() =
-        deltaCoeff_
-       *min
+        min
         (
             max
             (
                 max
                 (
-                    cw_*wallDist::New(mesh()).y(),
-                    cw_*hmax
+                    Cw_*wallDist::New(mesh).y(),
+                    Cw_*hmax
                 ),
                 tfaceToFacenMax
             ),
@@ -125,38 +132,47 @@ void Foam::IDDESDelta::calcDelta()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::IDDESDelta::IDDESDelta
+Foam::LESModels::IDDESDelta::IDDESDelta
 (
     const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
+    const turbulenceModel& turbulence,
+    const dictionary& dict
 )
 :
-    LESdelta(name, mesh),
-    hmax_(LESdelta::New("hmax", mesh, dd.parent())),
-    deltaCoeff_(readScalar(dd.subDict(type()+"Coeffs").lookup("deltaCoeff"))),
-    cw_(0.15)
+    LESdelta(name, turbulence),
+    hmax_
+    (
+        IOobject::groupName("hmax", turbulence.U().group()),
+        turbulence,
+        dict
+    ),
+    Cw_
+    (
+        dict.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cw", 0.15)
+    )
 {
-    dd.subDict(type() + "Coeffs").readIfPresent("cw", cw_);
     calcDelta();
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::IDDESDelta::read(const dictionary& dd)
+void Foam::LESModels::IDDESDelta::read(const dictionary& dict)
 {
-    dd.subDict(type() + "Coeffs").lookup("deltaCoeff") >> deltaCoeff_;
+    const dictionary& coeffsDict(dict.subDict(type() + "Coeffs"));
+
+    coeffsDict.readIfPresent<scalar>("Cw", Cw_);
+
     calcDelta();
 }
 
 
-void Foam::IDDESDelta::correct()
+void Foam::LESModels::IDDESDelta::correct()
 {
-    if (mesh_.changing())
+    if (turbulenceModel_.mesh().changing())
     {
+        hmax_.correct();
         calcDelta();
-        hmax_().correct();
     }
 }
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
similarity index 88%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
rename to src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
index 0274a192f..4f1bf55b1 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,12 +37,14 @@ SourceFiles
 #ifndef IDDESDeltaDelta_H
 #define IDDESDeltaDelta_H
 
-#include "incompressibleLESdelta.H"
+#include "maxDeltaxyz.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace LESModels
+{
 
 /*---------------------------------------------------------------------------*\
                          Class IDDESDelta Declaration
@@ -54,9 +56,9 @@ class IDDESDelta
 {
     // Private data
 
-        autoPtr<Foam::LESdelta> hmax_;
-        scalar deltaCoeff_;
-        scalar cw_;
+        maxDeltaxyz hmax_;
+
+        scalar Cw_;
 
 
     // Private Member Functions
@@ -81,7 +83,7 @@ public:
         IDDESDelta
         (
             const word& name,
-            const fvMesh& mesh,
+            const turbulenceModel& turbulence,
             const dictionary&
         );
 
@@ -97,6 +99,12 @@ public:
         //- Read the LESdelta dictionary
         void read(const dictionary&);
 
+        //- Return the hmax delta field
+        const volScalarField& hmax() const
+        {
+            return hmax_;
+        }
+
         // Correct values
         void correct();
 };
@@ -104,6 +112,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace LESModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 5a8ff1c3f..a685bd5e5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,20 +36,24 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::LESdelta::LESdelta(const word& name, const fvMesh& mesh)
+Foam::LESdelta::LESdelta
+(
+    const word& name,
+    const turbulenceModel& turbulence
+)
 :
-    mesh_(mesh),
+    turbulenceModel_(turbulence),
     delta_
     (
         IOobject
         (
             name,
-            mesh.time().timeName(),
-            mesh,
+            turbulence.mesh().time().timeName(),
+            turbulence.mesh(),
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        mesh,
+        turbulence.mesh(),
         dimensionedScalar(name, dimLength, SMALL),
         calculatedFvPatchScalarField::typeName
     )
@@ -61,7 +65,7 @@ Foam::LESdelta::LESdelta(const word& name, const fvMesh& mesh)
 Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 (
     const word& name,
-    const fvMesh& mesh,
+    const turbulenceModel& turbulence,
     const dictionary& dict
 )
 {
@@ -76,7 +80,7 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
     {
         FatalErrorIn
         (
-            "LESdelta::New(const fvMesh&, const dictionary&)"
+            "LESdelta::New(const word& name, const turbulenceModel& turbulence)"
         )   << "Unknown LESdelta type "
             << deltaType << nl << nl
             << "Valid LESdelta types are :" << endl
@@ -84,14 +88,14 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
             << exit(FatalError);
     }
 
-    return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+    return autoPtr<LESdelta>(cstrIter()(name, turbulence, dict));
 }
 
 
 Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 (
     const word& name,
-    const fvMesh& mesh,
+    const turbulenceModel& turbulence,
     const dictionary& dict,
     const dictionaryConstructorTable& additionalConstructors
 )
@@ -106,7 +110,7 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 
     if (cstrIter != additionalConstructors.end())
     {
-        return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+        return autoPtr<LESdelta>(cstrIter()(name, turbulence, dict));
     }
     else
     {
@@ -117,7 +121,9 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
         {
             FatalErrorIn
             (
-                "LESdelta::New(const fvMesh&, const dictionary&)"
+                "LESdelta::New(const word& name, "
+                "const turbulenceModel& turbulence, "
+                "const dictionaryConstructorTable&)"
             )   << "Unknown LESdelta type "
                 << deltaType << nl << nl
                 << "Valid LESdelta types are :" << endl
@@ -129,7 +135,7 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
         }
         else
         {
-            return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+            return autoPtr<LESdelta>(cstrIter()(name, turbulence, dict));
         }
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
index c84ae74c3..35aea4620 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,9 +35,8 @@ SourceFiles
 #ifndef LESdelta_H
 #define LESdelta_H
 
+#include "turbulenceModel.H"
 #include "volFields.H"
-#include "typeInfo.H"
-#include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,8 +44,6 @@ SourceFiles
 namespace Foam
 {
 
-class fvMesh;
-
 /*---------------------------------------------------------------------------*\
                           Class LESdelta Declaration
 \*---------------------------------------------------------------------------*/
@@ -58,7 +55,7 @@ protected:
 
     // Protected data
 
-        const fvMesh& mesh_;
+        const turbulenceModel& turbulenceModel_;
 
         volScalarField delta_;
 
@@ -87,17 +84,21 @@ public:
             dictionary,
             (
                 const word& name,
-                const fvMesh& mesh,
-                const dictionary& LESdeltaDict
+                const turbulenceModel& turbulence,
+                const dictionary& dict
             ),
-            (name, mesh, LESdeltaDict)
+            (name, turbulence, dict)
         );
 
 
     // Constructors
 
-        //- Construct from name and mesh
-        LESdelta(const word& name, const fvMesh&);
+        //- Construct from name, turbulenceModel and dictionary
+        LESdelta
+        (
+            const word& name,
+            const turbulenceModel& turbulence
+        );
 
 
     // Selectors
@@ -106,16 +107,16 @@ public:
         static autoPtr<LESdelta> New
         (
             const word& name,
-            const fvMesh&,
-            const dictionary&
+            const turbulenceModel& turbulence,
+            const dictionary& dict
         );
 
         //- Return a reference to the selected LES delta
         static autoPtr<LESdelta> New
         (
             const word& name,
-            const fvMesh&,
-            const dictionary&,
+            const turbulenceModel& turbulence,
+            const dictionary& dict,
             const dictionaryConstructorTable&
         );
 
@@ -127,10 +128,10 @@ public:
 
     // Member Functions
 
-        //- Return mesh reference
-        const fvMesh& mesh() const
+        //- Return turbulenceModel reference
+        const turbulenceModel& turbulence() const
         {
-            return mesh_;
+            return turbulenceModel_;
         }
 
         //- Read the LESdelta dictionary
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
index 9d90e7c69..d2b9f762b 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
@@ -30,35 +30,46 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace LESModels
 {
     defineTypeNameAndDebug(PrandtlDelta, 0);
     addToRunTimeSelectionTable(LESdelta, PrandtlDelta, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::PrandtlDelta::calcDelta()
+void Foam::LESModels::PrandtlDelta::calcDelta()
 {
     delta_ = min
     (
         static_cast<const volScalarField&>(geometricDelta_()),
-        (kappa_/Cdelta_)*wallDist::New(mesh_).y()
+        (kappa_/Cdelta_)*wallDist::New(turbulenceModel_.mesh()).y()
     );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::PrandtlDelta::PrandtlDelta
+Foam::LESModels::PrandtlDelta::PrandtlDelta
 (
     const word& name,
-    const fvMesh& mesh,
+    const turbulenceModel& turbulence,
     const dictionary& dict
 )
 :
-    LESdelta(name, mesh),
-    geometricDelta_(LESdelta::New(name, mesh, dict.subDict(type() + "Coeffs"))),
+    LESdelta(name, turbulence),
+    geometricDelta_
+    (
+        LESdelta::New
+        (
+            name,
+            turbulence,
+            dict.subDict(type() + "Coeffs")
+        )
+    ),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     Cdelta_
     (
@@ -71,7 +82,7 @@ Foam::PrandtlDelta::PrandtlDelta
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::PrandtlDelta::read(const dictionary& dict)
+void Foam::LESModels::PrandtlDelta::read(const dictionary& dict)
 {
     const dictionary& coeffDict(dict.subDict(type() + "Coeffs"));
 
@@ -82,11 +93,11 @@ void Foam::PrandtlDelta::read(const dictionary& dict)
 }
 
 
-void Foam::PrandtlDelta::correct()
+void Foam::LESModels::PrandtlDelta::correct()
 {
     geometricDelta_().correct();
 
-    if (mesh_.changing())
+    if (turbulenceModel_.mesh().changing())
     {
         calcDelta();
     }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
index d8840ff1a..3cb8b7742 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace LESModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class PrandtlDelta Declaration
@@ -75,11 +77,11 @@ public:
 
     // Constructors
 
-        //- Construct from name, mesh and IOdictionary
+        //- Construct from name, turbulenceModel and dictionary
         PrandtlDelta
         (
             const word& name,
-            const fvMesh& mesh,
+            const turbulenceModel& turbulence,
             const dictionary&
         );
 
@@ -101,6 +103,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace LESModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
index cdacbc669..4767c400c 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,21 +29,26 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace LESModels
 {
     defineTypeNameAndDebug(cubeRootVolDelta, 0);
     addToRunTimeSelectionTable(LESdelta, cubeRootVolDelta, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::cubeRootVolDelta::calcDelta()
+void Foam::LESModels::cubeRootVolDelta::calcDelta()
 {
-    label nD = mesh().nGeometricD();
+    const fvMesh& mesh = turbulenceModel_.mesh();
+
+    label nD = mesh.nGeometricD();
 
     if (nD == 3)
     {
-        delta_.internalField() = deltaCoeff_*pow(mesh().V(), 1.0/3.0);
+        delta_.internalField() = deltaCoeff_*pow(mesh.V(), 1.0/3.0);
     }
     else if (nD == 2)
     {
@@ -51,19 +56,19 @@ void Foam::cubeRootVolDelta::calcDelta()
             << "Case is 2D, LES is not strictly applicable\n"
             << endl;
 
-        const Vector<label>& directions = mesh().geometricD();
+        const Vector<label>& directions = mesh.geometricD();
 
         scalar thickness = 0.0;
         for (direction dir=0; dir<directions.nComponents; dir++)
         {
             if (directions[dir] == -1)
             {
-                thickness = mesh().bounds().span()[dir];
+                thickness = mesh.bounds().span()[dir];
                 break;
             }
         }
 
-        delta_.internalField() = deltaCoeff_*sqrt(mesh().V()/thickness);
+        delta_.internalField() = deltaCoeff_*sqrt(mesh.V()/thickness);
     }
     else
     {
@@ -76,14 +81,14 @@ void Foam::cubeRootVolDelta::calcDelta()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cubeRootVolDelta::cubeRootVolDelta
+Foam::LESModels::cubeRootVolDelta::cubeRootVolDelta
 (
     const word& name,
-    const fvMesh& mesh,
+    const turbulenceModel& turbulence,
     const dictionary& dict
 )
 :
-    LESdelta(name, mesh),
+    LESdelta(name, turbulence),
     deltaCoeff_
     (
         dict.subDict(type() + "Coeffs").lookupOrDefault<scalar>("deltaCoeff", 1)
@@ -95,7 +100,7 @@ Foam::cubeRootVolDelta::cubeRootVolDelta
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::cubeRootVolDelta::read(const dictionary& dict)
+void Foam::LESModels::cubeRootVolDelta::read(const dictionary& dict)
 {
     dict.subDict(type() + "Coeffs").readIfPresent<scalar>
     (
@@ -107,9 +112,9 @@ void Foam::cubeRootVolDelta::read(const dictionary& dict)
 }
 
 
-void Foam::cubeRootVolDelta::correct()
+void Foam::LESModels::cubeRootVolDelta::correct()
 {
-    if (mesh_.changing())
+    if (turbulenceModel_.mesh().changing())
     {
         calcDelta();
     }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
index f6abbe7e1..d0238d8df 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace LESModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class cubeRootVolDelta Declaration
@@ -73,11 +75,11 @@ public:
 
     // Constructors
 
-        //- Construct from name, mesh and IOdictionary
+        //- Construct from name, turbulenceModel and dictionary
         cubeRootVolDelta
         (
             const word& name,
-            const fvMesh& mesh,
+            const turbulenceModel& turbulence,
             const dictionary&
         );
 
@@ -99,6 +101,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace LESModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
index 9e4e57471..6c277bf7e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,17 +29,22 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace LESModels
 {
     defineTypeNameAndDebug(maxDeltaxyz, 0);
     addToRunTimeSelectionTable(LESdelta, maxDeltaxyz, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::maxDeltaxyz::calcDelta()
+void Foam::LESModels::maxDeltaxyz::calcDelta()
 {
-    label nD = mesh().nGeometricD();
+    const fvMesh& mesh = turbulenceModel_.mesh();
+
+    label nD = mesh.nGeometricD();
 
     tmp<volScalarField> hmax
     (
@@ -48,28 +53,28 @@ void Foam::maxDeltaxyz::calcDelta()
             IOobject
             (
                 "hmax",
-                mesh().time().timeName(),
-                mesh(),
+                mesh.time().timeName(),
+                mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            mesh(),
+            mesh,
             dimensionedScalar("zrero", dimLength, 0.0)
         )
     );
 
-    const cellList& cells = mesh().cells();
+    const cellList& cells = mesh.cells();
 
     forAll(cells,cellI)
     {
         scalar deltaMaxTmp = 0.0;
-        const labelList& cFaces = mesh().cells()[cellI];
-        const point& centrevector = mesh().cellCentres()[cellI];
+        const labelList& cFaces = mesh.cells()[cellI];
+        const point& centrevector = mesh.cellCentres()[cellI];
 
         forAll(cFaces, cFaceI)
         {
             label faceI = cFaces[cFaceI];
-            const point& facevector = mesh().faceCentres()[faceI];
+            const point& facevector = mesh.faceCentres()[faceI];
             scalar tmp = mag(facevector - centrevector);
             if (tmp > deltaMaxTmp)
             {
@@ -102,14 +107,14 @@ void Foam::maxDeltaxyz::calcDelta()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::maxDeltaxyz::maxDeltaxyz
+Foam::LESModels::maxDeltaxyz::maxDeltaxyz
 (
     const word& name,
-    const fvMesh& mesh,
+    const turbulenceModel& turbulence,
     const dictionary& dict
 )
 :
-    LESdelta(name, mesh),
+    LESdelta(name, turbulence),
     deltaCoeff_
     (
         dict.subDict(type() + "Coeffs").lookupOrDefault<scalar>("deltaCoeff", 1)
@@ -121,21 +126,19 @@ Foam::maxDeltaxyz::maxDeltaxyz
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::maxDeltaxyz::read(const dictionary& dict)
+void Foam::LESModels::maxDeltaxyz::read(const dictionary& dict)
 {
-    dict.subDict(type() + "Coeffs").readIfPresent<scalar>
-    (
-        "deltaCoeff",
-        deltaCoeff_
-    );
+    const dictionary& coeffsDict(dict.subDict(type() + "Coeffs"));
+
+    coeffsDict.readIfPresent<scalar>("deltaCoeff", deltaCoeff_);
 
     calcDelta();
 }
 
 
-void Foam::maxDeltaxyz::correct()
+void Foam::LESModels::maxDeltaxyz::correct()
 {
-    if (mesh_.changing())
+    if (turbulenceModel_.mesh().changing())
     {
         calcDelta();
     }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
index 05df8af55..8fd626654 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,6 +44,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace LESModels
+{
 
 /*---------------------------------------------------------------------------*\
                          Class maxDeltaxyz Declaration
@@ -77,11 +79,11 @@ public:
 
     // Constructors
 
-        //- Construct from name, mesh and IOdictionary
+        //- Construct from name, turbulenceModel and dictionary
         maxDeltaxyz
         (
             const word& name,
-            const fvMesh& mesh,
+            const turbulenceModel& turbulence,
             const dictionary&
         );
 
@@ -103,6 +105,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace LESModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
index 07a5ad6fe..843f1076a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,26 +30,18 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace LESModels
 {
     defineTypeNameAndDebug(smoothDelta, 0);
     addToRunTimeSelectionTable(LESdelta, smoothDelta, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Fill changedFaces (with face labels) and changedFacesInfo (with delta)
-// This is the initial set of faces from which to start the waves.
-// Since there might be lots of places with delta jumps we can follow various
-// strategies for this initial 'seed'.
-// - start from single cell/face and let FaceCellWave pick up all others
-//   from there. might be quite a few waves before everything settles.
-// - start from all faces. Lots of initial transfers.
-// We do something inbetween:
-// - start from all faces where there is a jump. Since we cannot easily
-//   determine this across coupled patches (cyclic, processor) introduce
-//   all faces of these and let FaceCellWave sort it out.
-void Foam::smoothDelta::setChangedFaces
+void Foam::LESModels::smoothDelta::setChangedFaces
 (
     const polyMesh& mesh,
     const volScalarField& delta,
@@ -102,18 +94,20 @@ void Foam::smoothDelta::setChangedFaces
 }
 
 
-void Foam::smoothDelta::calcDelta()
+void Foam::LESModels::smoothDelta::calcDelta()
 {
+    const fvMesh& mesh = turbulenceModel_.mesh();
+
     const volScalarField& geometricDelta = geometricDelta_();
 
     // Fill changed faces with info
-    DynamicList<label> changedFaces(mesh_.nFaces()/100 + 100);
+    DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
     DynamicList<deltaData> changedFacesInfo(changedFaces.size());
 
-    setChangedFaces(mesh_, geometricDelta, changedFaces, changedFacesInfo);
+    setChangedFaces(mesh, geometricDelta, changedFaces, changedFacesInfo);
 
     // Set initial field on cells.
-    List<deltaData> cellDeltaData(mesh_.nCells());
+    List<deltaData> cellDeltaData(mesh.nCells());
 
     forAll(geometricDelta, cellI)
     {
@@ -121,18 +115,18 @@ void Foam::smoothDelta::calcDelta()
     }
 
     // Set initial field on faces.
-    List<deltaData> faceDeltaData(mesh_.nFaces());
+    List<deltaData> faceDeltaData(mesh.nFaces());
 
 
     // Propagate information over whole domain.
     FaceCellWave<deltaData, scalar> deltaCalc
     (
-        mesh_,
+        mesh,
         changedFaces,
         changedFacesInfo,
         faceDeltaData,
         cellDeltaData,
-        mesh_.globalData().nTotalCells()+1,  // max iterations
+        mesh.globalData().nTotalCells()+1,  // max iterations
         maxDeltaRatio_
     );
 
@@ -145,17 +139,22 @@ void Foam::smoothDelta::calcDelta()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::smoothDelta::smoothDelta
+Foam::LESModels::smoothDelta::smoothDelta
 (
     const word& name,
-    const fvMesh& mesh,
+    const turbulenceModel& turbulence,
     const dictionary& dict
 )
 :
-    LESdelta(name, mesh),
+    LESdelta(name, turbulence),
     geometricDelta_
     (
-        LESdelta::New("geometricDelta", mesh, dict.subDict(type() + "Coeffs"))
+        LESdelta::New
+        (
+            "geometricDelta",
+            turbulence,
+            dict.subDict(type() + "Coeffs")
+        )
     ),
     maxDeltaRatio_
     (
@@ -168,7 +167,7 @@ Foam::smoothDelta::smoothDelta
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::smoothDelta::read(const dictionary& dict)
+void Foam::LESModels::smoothDelta::read(const dictionary& dict)
 {
     const dictionary& coeffsDict(dict.subDict(type() + "Coeffs"));
 
@@ -178,11 +177,11 @@ void Foam::smoothDelta::read(const dictionary& dict)
 }
 
 
-void Foam::smoothDelta::correct()
+void Foam::LESModels::smoothDelta::correct()
 {
     geometricDelta_().correct();
 
-    if (mesh_.changing())
+    if (turbulenceModel_.mesh().changing())
     {
         calcDelta();
     }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
index e80d09484..bae48b7a8 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace LESModels
+{
 
 /*---------------------------------------------------------------------------*\
                          Class smoothDelta Declaration
@@ -225,7 +227,19 @@ private:
         // Calculate the delta values
         void calcDelta();
 
-
+        //- Fill changedFaces (with face labels) and changedFacesInfo
+        //  (with delta).
+        //  This is the initial set of faces from which to start the waves.
+        //  Since there might be lots of places with delta jumps we can follow
+        //  various strategies for this initial 'seed'.
+        //  - start from single cell/face and let FaceCellWave pick up all
+        //    others from there. might be quite a few waves before everything
+        //    settles.
+        //  - start from all faces. Lots of initial transfers.
+        //  We do something in between:
+        //  - start from all faces where there is a jump. Since we cannot easily
+        //    determine this across coupled patches (cyclic, processor)
+        //    introduce all faces of these and let FaceCellWave sort it out.
         void setChangedFaces
         (
             const polyMesh& mesh,
@@ -243,11 +257,11 @@ public:
 
     // Constructors
 
-        //- Construct from name, mesh and IOdictionary
+        //- Construct from name, turbulenceModel and dictionary
         smoothDelta
         (
             const word& name,
-            const fvMesh& mesh,
+            const turbulenceModel& turbulence,
             const dictionary&
         );
 
@@ -267,14 +281,19 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 //- Data associated with deltaData type are contiguous
 template<>
-inline bool contiguous<smoothDelta::deltaData>()
+inline bool contiguous<LESModels::smoothDelta::deltaData>()
 {
     return true;
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
index 16fbd8b51..eef7c42d8 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,16 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Update this with w2 if applicable
 template<class TrackingData>
-inline bool smoothDelta::deltaData::update
+inline bool Foam::LESModels::smoothDelta::deltaData::update
 (
     const smoothDelta::deltaData& w2,
     const scalar scale,
@@ -67,15 +61,13 @@ inline bool smoothDelta::deltaData::update
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
-inline smoothDelta::deltaData::deltaData()
+inline Foam::LESModels::smoothDelta::deltaData::deltaData()
 :
     delta_(-GREAT)
 {}
 
 
-// Construct from components
-inline smoothDelta::deltaData::deltaData(const scalar delta)
+inline Foam::LESModels::smoothDelta::deltaData::deltaData(const scalar delta)
 :
     delta_(delta)
 {}
@@ -84,15 +76,17 @@ inline smoothDelta::deltaData::deltaData(const scalar delta)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class TrackingData>
-inline bool smoothDelta::deltaData::valid(TrackingData& td) const
+inline bool Foam::LESModels::smoothDelta::deltaData::valid
+(
+    TrackingData& td
+) const
 {
     return delta_ > -SMALL;
 }
 
 
-// Checks for cyclic faces
 template<class TrackingData>
-inline bool smoothDelta::deltaData::sameGeometry
+inline bool Foam::LESModels::smoothDelta::deltaData::sameGeometry
 (
     const polyMesh&,
     const deltaData&,
@@ -105,7 +99,7 @@ inline bool smoothDelta::deltaData::sameGeometry
 
 
 template<class TrackingData>
-inline void smoothDelta::deltaData::leaveDomain
+inline void Foam::LESModels::smoothDelta::deltaData::leaveDomain
 (
     const polyMesh&,
     const polyPatch&,
@@ -117,7 +111,7 @@ inline void smoothDelta::deltaData::leaveDomain
 
 
 template<class TrackingData>
-inline void smoothDelta::deltaData::transform
+inline void Foam::LESModels::smoothDelta::deltaData::transform
 (
     const polyMesh&,
     const tensor&,
@@ -126,9 +120,8 @@ inline void smoothDelta::deltaData::transform
 {}
 
 
-// Update absolute geometric quantities.
 template<class TrackingData>
-inline void smoothDelta::deltaData::enterDomain
+inline void Foam::LESModels::smoothDelta::deltaData::enterDomain
 (
     const polyMesh&,
     const polyPatch&,
@@ -139,9 +132,8 @@ inline void smoothDelta::deltaData::enterDomain
 {}
 
 
-// Update this (cellI) with face information.
 template<class TrackingData>
-inline bool smoothDelta::deltaData::updateCell
+inline bool Foam::LESModels::smoothDelta::deltaData::updateCell
 (
     const polyMesh&,
     const label,
@@ -156,9 +148,8 @@ inline bool smoothDelta::deltaData::updateCell
 }
 
 
-// Update this (face) with cell information.
 template<class TrackingData>
-inline bool smoothDelta::deltaData::updateFace
+inline bool Foam::LESModels::smoothDelta::deltaData::updateFace
 (
     const polyMesh&,
     const label,
@@ -173,9 +164,8 @@ inline bool smoothDelta::deltaData::updateFace
 }
 
 
-// Update this (face) with coupled face information.
 template<class TrackingData>
-inline bool smoothDelta::deltaData::updateFace
+inline bool Foam::LESModels::smoothDelta::deltaData::updateFace
 (
     const polyMesh&,
     const label,
@@ -190,7 +180,7 @@ inline bool smoothDelta::deltaData::updateFace
 
 
 template<class TrackingData>
-inline bool smoothDelta::deltaData::equal
+inline bool Foam::LESModels::smoothDelta::deltaData::equal
 (
     const deltaData& rhs,
     TrackingData& td
@@ -202,7 +192,7 @@ inline bool smoothDelta::deltaData::equal
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline bool smoothDelta::deltaData::operator==
+inline bool Foam::LESModels::smoothDelta::deltaData::operator==
 (
     const deltaData& rhs
 ) const
@@ -211,7 +201,7 @@ inline bool smoothDelta::deltaData::operator==
 }
 
 
-inline bool smoothDelta::deltaData::operator!=
+inline bool Foam::LESModels::smoothDelta::deltaData::operator!=
 (
     const deltaData& rhs
 ) const
@@ -220,8 +210,4 @@ inline bool smoothDelta::deltaData::operator!=
 }
 
 
-// ************************************************************************* //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
similarity index 61%
rename from src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
rename to src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
index 35cf23f68..b0338981e 100644
--- a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,50 +24,46 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "vanDriestDelta.H"
-#include "LESModel.H"
 #include "wallFvPatch.H"
 #include "wallDistData.H"
 #include "wallPointYPlus.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(vanDriestDelta, 0);
-addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
+    defineTypeNameAndDebug(vanDriestDelta, 0);
+    addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
+}
+}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void vanDriestDelta::calcDelta()
+void Foam::LESModels::vanDriestDelta::calcDelta()
 {
-    const LESModel& lesModel = mesh_.lookupObject<LESModel>("LESProperties");
+    const fvMesh& mesh = turbulenceModel_.mesh();
 
-    const volVectorField& U = lesModel.U();
-    const tmp<volScalarField> tnu = lesModel.nu();
+    const volVectorField& U = turbulenceModel_.U();
+    const tmp<volScalarField> tnu = turbulenceModel_.nu();
     const volScalarField& nu = tnu();
-    tmp<volScalarField> nuSgs = lesModel.nuSgs();
+    tmp<volScalarField> nuSgs = turbulenceModel_.nut();
 
     volScalarField ystar
     (
         IOobject
         (
             "ystar",
-            mesh_.time().constant(),
-            mesh_
+            mesh.time().constant(),
+            mesh
         ),
-        mesh_,
+        mesh,
         dimensionedScalar("ystar", dimLength, GREAT)
     );
 
-    const fvPatchList& patches = mesh_.boundary();
+    const fvPatchList& patches = mesh.boundary();
     forAll(patches, patchi)
     {
         if (isA<wallFvPatch>(patches[patchi]))
@@ -83,7 +79,7 @@ void vanDriestDelta::calcDelta()
 
     scalar cutOff = wallPointYPlus::yPlusCutOff;
     wallPointYPlus::yPlusCutOff = 500;
-    wallDistData<wallPointYPlus> y(mesh_, ystar);
+    wallDistData<wallPointYPlus> y(mesh, ystar);
     wallPointYPlus::yPlusCutOff = cutOff;
 
     delta_ = min
@@ -96,30 +92,39 @@ void vanDriestDelta::calcDelta()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-vanDriestDelta::vanDriestDelta
+Foam::LESModels::vanDriestDelta::vanDriestDelta
 (
     const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
+    const turbulenceModel& turbulence,
+    const dictionary& dict
 )
 :
-    LESdelta(name, mesh),
+    LESdelta(name, turbulence),
     geometricDelta_
     (
-        LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs"))
+        LESdelta::New
+        (
+            IOobject::groupName("geometricDelta", turbulence.U().group()),
+            turbulence,
+            dict.subDict(type() + "Coeffs")
+        )
     ),
-    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.41)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     Aplus_
     (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
+        dict.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
     ),
     Cdelta_
     (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
+        dict.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
     ),
     calcInterval_
     (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<label>("calcInterval", 1)
+        dict.subDict(type() + "Coeffs").lookupOrDefault<label>
+        (
+            "calcInterval",
+            1
+        )
     )
 {
     delta_ = geometricDelta_();
@@ -128,22 +133,23 @@ vanDriestDelta::vanDriestDelta
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void vanDriestDelta::read(const dictionary& d)
+void Foam::LESModels::vanDriestDelta::read(const dictionary& dict)
 {
-    const dictionary& dd(d.subDict(type() + "Coeffs"));
+    const dictionary& coeffsDict(dict.subDict(type() + "Coeffs"));
+
+    geometricDelta_().read(coeffsDict);
+    dict.readIfPresent<scalar>("kappa", kappa_);
+    coeffsDict.readIfPresent<scalar>("Aplus", Aplus_);
+    coeffsDict.readIfPresent<scalar>("Cdelta", Cdelta_);
+    coeffsDict.readIfPresent<label>("calcInterval", calcInterval_);
 
-    geometricDelta_().read(dd);
-    d.readIfPresent<scalar>("kappa", kappa_);
-    dd.readIfPresent<scalar>("Aplus", Aplus_);
-    dd.readIfPresent<scalar>("Cdelta", Cdelta_);
-    dd.readIfPresent<label>("calcInterval", calcInterval_);
     calcDelta();
 }
 
 
-void vanDriestDelta::correct()
+void Foam::LESModels::vanDriestDelta::correct()
 {
-    if (mesh().time().timeIndex() % calcInterval_ == 0)
+    if (turbulenceModel_.mesh().time().timeIndex() % calcInterval_ == 0)
     {
         geometricDelta_().correct();
         calcDelta();
@@ -151,10 +157,4 @@ void vanDriestDelta::correct()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H
similarity index 87%
rename from src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
rename to src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H
index 217f86e9d..81feca579 100644
--- a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::LESModels::vanDriestDelta
+    Foam::vanDriestDelta
 
 Description
     Simple cube-root of cell volume delta used in incompressible LES models.
@@ -35,14 +35,12 @@ SourceFiles
 #ifndef vanDriestDelta_H
 #define vanDriestDelta_H
 
-#include "incompressibleLESdelta.H"
+#include "LESdelta.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
 
@@ -56,7 +54,7 @@ class vanDriestDelta
 {
     // Private data
 
-        autoPtr<Foam::LESdelta> geometricDelta_;
+        autoPtr<LESdelta> geometricDelta_;
         scalar kappa_;
         scalar Aplus_;
         scalar Cdelta_;
@@ -81,8 +79,13 @@ public:
 
     // Constructors
 
-        //- Construct from name, mesh and IOdictionary
-        vanDriestDelta(const word& name, const fvMesh& mesh, const dictionary&);
+        //- Construct from name, turbulenceModel and dictionary
+        vanDriestDelta
+        (
+            const word& name,
+            const turbulenceModel& turbulence,
+            const dictionary&
+        );
 
 
     //- Destructor
@@ -103,7 +106,6 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
similarity index 55%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
rename to src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
index a344ee920..186970ca6 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -24,70 +24,73 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SpalartAllmarasDDES.H"
-#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::rd
+(
+    const volScalarField& magGradU
+) const
+{
+    tmp<volScalarField> tr
+    (
+        min
+        (
+            this->nuEff()
+           /(
+               max
+               (
+                   magGradU,
+                   dimensionedScalar("SMALL", magGradU.dimensions(), SMALL)
+               )
+              *sqr(this->kappa_*this->y_)
+            ),
+            scalar(10)
+        )
+    );
+    tr().boundaryField() == 0.0;
+
+    return tr;
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::fd
+(
+    const volScalarField& magGradU
+) const
+{
+    return 1 - tanh(pow3(8*rd(magGradU)));
+}
 
-defineTypeNameAndDebug(SpalartAllmarasDDES, 0);
-addToRunTimeSelectionTable(LESModel, SpalartAllmarasDDES, dictionary);
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<volScalarField> SpalartAllmarasDDES::rd
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::dTilda
 (
-    const volScalarField& visc,
-    const volScalarField& S
+    const volScalarField& chi,
+    const volScalarField& fv1,
+    const volTensorField& gradU
 ) const
-{
-    return min
-    (
-        visc
-        /(
-            max
-            (
-                S,
-                dimensionedScalar("SMALL", S.dimensions(), SMALL)
-            )*sqr(kappa_*y_)
-          + dimensionedScalar
-            (
-                "ROOTVSMALL",
-                dimensionSet(0, 2 , -1, 0, 0),
-                ROOTVSMALL
-            )
-        ),
-        scalar(10)
-    );
-}
-
-
-tmp<volScalarField> SpalartAllmarasDDES::fd(const volScalarField& S) const
-{
-    return 1 - tanh(pow3(8*rd(nuEff(), S)));
-}
-
-
-tmp<volScalarField> SpalartAllmarasDDES::S(const volTensorField& gradU) const
-{
-    return sqrt(2.0)*mag(symm(gradU));
-}
-
-
-tmp<volScalarField> SpalartAllmarasDDES::dTilda(const volScalarField& S) const
 {
     return max
     (
-        y_
-      - fd(S)
-       *max(y_ - CDES_*delta(), dimensionedScalar("zero", dimLength, 0)),
+        this->y_
+      - fd(mag(gradU))
+       *max
+        (
+            this->y_ - this->CDES_*this->delta(),
+            dimensionedScalar("zero", dimLength, 0)
+        ),
         dimensionedScalar("small", dimLength, SMALL)
     );
 }
@@ -95,23 +98,35 @@ tmp<volScalarField> SpalartAllmarasDDES::dTilda(const volScalarField& S) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-SpalartAllmarasDDES::SpalartAllmarasDDES
+template<class BasicTurbulenceModel>
+SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
 (
+    const alphaField& alpha,
+    const rhoField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    SpalartAllmaras(U, phi, transport, turbulenceModelName, modelName)
+    SpalartAllmarasDES<BasicTurbulenceModel>
+    (
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    )
 {}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
similarity index 64%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
rename to src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index 5421384e2..addcb635a 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -22,18 +22,23 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::LESModels::SpalartAllmarasDDES
+    Foam::LESModels::SpalartAllmarasDDES
 
 Group
-    grpIcoDESTurbulence
+    grpDESTurbulence
 
 Description
-    SpalartAllmaras DDES LES turbulence model for incompressible flows
+    SpalartAllmaras DDES turbulence model for incompressible and compressible
+    flows
 
     Reference:
-    P.R. Spalart, S. Deck, S., M.L.Shur, K.D. Squires, M.Kh Strelets, and
-    A. Travin. `A new version of detached-eddy simulation, resistant to
-    ambiguous grid densities'. Theor. Comp. Fluid Dyn., 20:181-195, 2006.
+    \verbatim
+        Spalart, P. R., Deck, S., Shur, M. L., Squires, K. D., Strelets, M. K.,
+        & Travin, A. (2006).
+        A new version of detached-eddy simulation, resistant to ambiguous grid
+        densities.
+        Theoretical and computational fluid dynamics, 20(3), 181-195.
+    \endverbatim
 
 SourceFiles
     SpalartAllmarasDDES.C
@@ -43,14 +48,12 @@ SourceFiles
 #ifndef SpalartAllmarasDDES_H
 #define SpalartAllmarasDDES_H
 
-#include "SpalartAllmaras.H"
+#include "SpalartAllmarasDES.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
 
@@ -58,19 +61,16 @@ namespace LESModels
                      Class SpalartAllmarasDDES Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class BasicTurbulenceModel>
 class SpalartAllmarasDDES
 :
-    public SpalartAllmaras
+    public SpalartAllmarasDES<BasicTurbulenceModel>
 {
     // Private Member Functions
 
-        tmp<volScalarField> fd(const volScalarField& S) const;
+        tmp<volScalarField> fd(const volScalarField& magGradU) const;
 
-        tmp<volScalarField> rd
-        (
-            const volScalarField& visc,
-            const volScalarField& S
-        ) const;
+        tmp<volScalarField> rd(const volScalarField& magGradU) const;
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmarasDDES(const SpalartAllmarasDDES&);
@@ -82,13 +82,21 @@ protected:
     // Protected Member Functions
 
         //- Length scale
-        virtual tmp<volScalarField> dTilda(const volScalarField& S) const;
-
-        virtual tmp<volScalarField> S(const volTensorField& gradU) const;
+        virtual tmp<volScalarField> dTilda
+        (
+            const volScalarField& chi,
+            const volScalarField& fv1,
+            const volTensorField& gradU
+        ) const;
 
 
 public:
 
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
     //- Runtime type information
     TypeName("SpalartAllmarasDDES");
 
@@ -98,11 +106,14 @@ public:
         //- Construct from components
         SpalartAllmarasDDES
         (
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -115,11 +126,16 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "SpalartAllmarasDDES.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
new file mode 100644
index 000000000..f0a8c60ac
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
@@ -0,0 +1,454 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpalartAllmarasDES.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::chi() const
+{
+    return nuTilda_/this->nu();
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::fv1
+(
+    const volScalarField& chi
+) const
+{
+    const volScalarField chi3("chi3", pow3(chi));
+    return chi3/(chi3 + pow3(Cv1_));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::fv2
+(
+    const volScalarField& chi,
+    const volScalarField& fv1
+) const
+{
+    return 1.0 - chi/(1.0 + chi*fv1);
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::S
+(
+    const volTensorField& gradU
+) const
+{
+    return sqrt(2.0)*mag(symm(gradU));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::Omega
+(
+    const volTensorField& gradU
+) const
+{
+    return sqrt(2.0)*mag(skew(gradU));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::Stilda
+(
+    const volScalarField& chi,
+    const volScalarField& fv1,
+    const volScalarField& Omega,
+    const volScalarField& dTilda
+) const
+{
+    return
+    (
+        max
+        (
+            Omega
+          + fv2(chi, fv1)*nuTilda_/sqr(kappa_*dTilda),
+            Cs_*Omega
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::r
+(
+    const volScalarField& nur,
+    const volScalarField& Omega,
+    const volScalarField& dTilda
+) const
+{
+    tmp<volScalarField> tr
+    (
+        min
+        (
+            nur
+           /(
+                max
+                (
+                    Omega,
+                    dimensionedScalar("SMALL", Omega.dimensions(), SMALL)
+                )
+                *sqr(kappa_*dTilda)
+            ),
+            scalar(10)
+        )
+    );
+    tr().boundaryField() == 0.0;
+
+    return tr;
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::fw
+(
+    const volScalarField& Omega,
+    const volScalarField& dTilda
+) const
+{
+    const volScalarField r(this->r(nuTilda_, Omega, dTilda));
+    const volScalarField g(r + Cw2_*(pow6(r) - r));
+
+    return g*pow((1 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::dTilda
+(
+    const volScalarField& chi,
+    const volScalarField& fv1,
+    const volTensorField& gradU
+) const
+{
+    tmp<volScalarField> tdTilda(CDES_*this->delta());
+    min(tdTilda().dimensionedInternalField(), tdTilda(), y_);
+    return tdTilda;
+}
+
+
+template<class BasicTurbulenceModel>
+void SpalartAllmarasDES<BasicTurbulenceModel>::correctNut
+(
+    const volScalarField& fv1
+)
+{
+    this->nut_ = nuTilda_*fv1;
+    this->nut_.correctBoundaryConditions();
+}
+
+
+template<class BasicTurbulenceModel>
+void SpalartAllmarasDES<BasicTurbulenceModel>::correctNut()
+{
+    correctNut(fv1(this->chi()));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
+(
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName,
+    const word& type
+)
+:
+    LESeddyViscosity<BasicTurbulenceModel>
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    sigmaNut_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "sigmaNut",
+            this->coeffDict_,
+            0.66666
+        )
+    ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            this->coeffDict_,
+            0.41
+        )
+    ),
+    Cb1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cb1",
+            this->coeffDict_,
+            0.1355
+        )
+    ),
+    Cb2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cb2",
+            this->coeffDict_,
+            0.622
+        )
+    ),
+    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
+    Cw2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cw2",
+            this->coeffDict_,
+            0.3
+        )
+    ),
+    Cw3_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cw3",
+            this->coeffDict_,
+            2.0
+        )
+    ),
+    Cv1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cv1",
+            this->coeffDict_,
+            7.1
+        )
+    ),
+    Cs_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cs",
+            this->coeffDict_,
+            0.3
+        )
+    ),
+    CDES_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "CDES",
+            this->coeffDict_,
+            0.65
+        )
+    ),
+    ck_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "ck",
+            this->coeffDict_,
+            0.07
+        )
+    ),
+
+    nuTilda_
+    (
+        IOobject
+        (
+            "nuTilda",
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    ),
+
+    y_(wallDist::New(this->mesh_).y())
+{
+    if (type == typeName)
+    {
+        correctNut();
+        this->printCoeffs(type);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool SpalartAllmarasDES<BasicTurbulenceModel>::read()
+{
+    if (LESeddyViscosity<BasicTurbulenceModel>::read())
+    {
+        sigmaNut_.readIfPresent(this->coeffDict());
+        kappa_.readIfPresent(*this);
+
+        Cb1_.readIfPresent(this->coeffDict());
+        Cb2_.readIfPresent(this->coeffDict());
+        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
+        Cw2_.readIfPresent(this->coeffDict());
+        Cw3_.readIfPresent(this->coeffDict());
+        Cv1_.readIfPresent(this->coeffDict());
+        Cs_.readIfPresent(this->coeffDict());
+
+        CDES_.readIfPresent(this->coeffDict());
+        ck_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::
+DnuTildaEff() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField("DnuTildaEff", (nuTilda_ + this->nu())/sigmaNut_)
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::k() const
+{
+    const volScalarField chi(this->chi());
+    const volScalarField fv1(this->fv1(chi));
+    return sqr(this->nut()/ck_/dTilda(chi, fv1, fvc::grad(this->U_)));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::LESRegion() const
+{
+    const volScalarField chi(this->chi());
+    const volScalarField fv1(this->fv1(chi));
+
+    tmp<volScalarField> tLESRegion
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "DES::LESRegion",
+                this->mesh_.time().timeName(),
+                this->mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            neg(dTilda(chi, fv1, fvc::grad(this->U_)) - y_)
+        )
+    );
+
+    return tLESRegion;
+}
+
+
+template<class BasicTurbulenceModel>
+void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
+{
+    if (!this->turbulence_)
+    {
+        return;
+    }
+
+    // Local references
+    const alphaField& alpha = this->alpha_;
+    const rhoField& rho = this->rho_;
+    const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+    const volVectorField& U = this->U_;
+
+    LESeddyViscosity<BasicTurbulenceModel>::correct();
+
+    const volScalarField chi(this->chi());
+    const volScalarField fv1(this->fv1(chi));
+
+    tmp<volTensorField> tgradU = fvc::grad(U);
+    const volScalarField Omega(this->Omega(tgradU()));
+    const volScalarField dTilda(this->dTilda(chi, fv1, tgradU()));
+    const volScalarField Stilda(this->Stilda(chi, fv1, Omega, dTilda));
+
+    tmp<fvScalarMatrix> nuTildaEqn
+    (
+        fvm::ddt(alpha, rho, nuTilda_)
+      + fvm::div(alphaRhoPhi, nuTilda_)
+      - fvm::laplacian(alpha*rho*DnuTildaEff(), nuTilda_)
+      - Cb2_/sigmaNut_*alpha*rho*magSqr(fvc::grad(nuTilda_))
+     ==
+        Cb1_*alpha*rho*Stilda*nuTilda_
+      - fvm::Sp
+        (
+            Cw1_*alpha*rho*fw(Stilda, dTilda)*nuTilda_/sqr(dTilda),
+            nuTilda_
+        )
+    );
+
+    nuTildaEqn().relax();
+    solve(nuTildaEqn);
+    bound(nuTilda_, dimensionedScalar("zero", nuTilda_.dimensions(), 0.0));
+    nuTilda_.correctBoundaryConditions();
+
+    correctNut(fv1);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
similarity index 54%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
rename to src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
index f5753ebfc..4c512487a 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
@@ -22,209 +22,203 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::LESModels::SpalartAllmaras
+    Foam::LESModels::SpalartAllmarasDES
 
 Group
-    grpIcoDESTurbulence
+    grpDESTurbulence
 
 Description
-    SpalartAllmaras DES (SA + LES) turbulence model for incompressible flows
+    SpalartAllmarasDES DES turbulence model for incompressible and
+    compressible flows
 
-    Extended according to
+    Reference:
     \verbatim
-        "An Unstructured Grid Generation and Adaptive Solution Technique
-        for High Reynolds Number Compressible Flows"
-        G.A. Ashford,
-        Ph.D. thesis, University of Michigan, 1996.
+        Spalart, P. R., Jou, W. H., Strelets, M., & Allmaras, S. R. (1997).
+        Comments on the feasibility of LES for wings, and on a hybrid
+        RANS/LES approach.
+        Advances in DNS/LES, 1, 4-8.
     \endverbatim
-    by using the optional flag \c ashfordCorrection
 
 SourceFiles
-    SpalartAllmaras.C
+    SpalartAllmarasDES.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SpalartAllmaras_H
-#define SpalartAllmaras_H
+#ifndef SpalartAllmarasDES_H
+#define SpalartAllmarasDES_H
 
-#include "DESModel.H"
-#include "volFields.H"
-#include "wallDist.H"
+#include "LESeddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class SpalartAllmaras Declaration
+                        Class SpalartAllmarasDES Declaration
 \*---------------------------------------------------------------------------*/
 
-class SpalartAllmaras
+template<class BasicTurbulenceModel>
+class SpalartAllmarasDES
 :
-    public DESModel
+    public LESeddyViscosity<BasicTurbulenceModel>
 {
     // Private Member Functions
 
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields();
-
         // Disallow default bitwise copy construct and assignment
-        SpalartAllmaras(const SpalartAllmaras&);
-        SpalartAllmaras& operator=(const SpalartAllmaras&);
+        SpalartAllmarasDES(const SpalartAllmarasDES&);
+        SpalartAllmarasDES& operator=(const SpalartAllmarasDES&);
 
 
 protected:
 
     // Protected data
 
-        dimensionedScalar sigmaNut_;
-        dimensionedScalar kappa_;
-
-
         // Model constants
 
+            dimensionedScalar sigmaNut_;
+            dimensionedScalar kappa_;
+
             dimensionedScalar Cb1_;
             dimensionedScalar Cb2_;
-            dimensionedScalar Cv1_;
-            dimensionedScalar Cv2_;
-            dimensionedScalar CDES_;
-            dimensionedScalar ck_;
             dimensionedScalar Cw1_;
             dimensionedScalar Cw2_;
             dimensionedScalar Cw3_;
-
-
-        //- Optional flag to activate the Ashford correction
-        Switch ashfordCorrection_;
-
+            dimensionedScalar Cv1_;
+            dimensionedScalar Cs_;
+            dimensionedScalar CDES_;
+            dimensionedScalar ck_;
 
         // Fields
 
+            volScalarField nuTilda_;
+
             //- Wall distance
             //  Note: different to wall distance in parent RASModel
             //  which is for near-wall cells only
             const volScalarField& y_;
 
-            volScalarField nuTilda_;
-            volScalarField nuSgs_;
-
 
     // Protected Member Functions
 
-        virtual tmp<volScalarField> fv1() const;
-        virtual tmp<volScalarField> fv2() const;
-        virtual tmp<volScalarField> fv3() const;
-        virtual tmp<volScalarField> S(const volTensorField& gradU) const;
+        tmp<volScalarField> chi() const;
 
-        virtual tmp<volScalarField> STilda
+        tmp<volScalarField> fv1(const volScalarField& chi) const;
+
+        tmp<volScalarField> fv2
         (
-            const volScalarField& S,
+            const volScalarField& chi,
+            const volScalarField& fv1
+        ) const;
+
+        tmp<volScalarField> S(const volTensorField& gradU) const;
+
+        tmp<volScalarField> Omega(const volTensorField& gradU) const;
+
+        tmp<volScalarField> Stilda
+        (
+            const volScalarField& chi,
+            const volScalarField& fv1,
+            const volScalarField& Omega,
             const volScalarField& dTilda
         ) const;
 
-        virtual tmp<volScalarField> r
+        tmp<volScalarField> r
         (
-            const volScalarField& visc,
-            const volScalarField& S,
+            const volScalarField& nur,
+            const volScalarField& Omega,
             const volScalarField& dTilda
         ) const;
 
-        virtual tmp<volScalarField> fw
+        tmp<volScalarField> fw
         (
-            const volScalarField& S,
+            const volScalarField& Omega,
             const volScalarField& dTilda
         ) const;
 
         //- Length scale
-        virtual tmp<volScalarField> dTilda(const volScalarField& S) const;
+        virtual tmp<volScalarField> dTilda
+        (
+            const volScalarField& chi,
+            const volScalarField& fv1,
+            const volTensorField& gradU
+        ) const;
+
+        void correctNut(const volScalarField& fv1);
+        virtual void correctNut();
 
 
 public:
 
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
     //- Runtime type information
-    TypeName("SpalartAllmaras");
+    TypeName("SpalartAllmarasDES");
 
 
     // Constructors
 
         //- Construct from components
-        SpalartAllmaras
+        SpalartAllmarasDES
         (
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
     //- Destructor
-    virtual ~SpalartAllmaras()
+    virtual ~SpalartAllmarasDES()
     {}
 
 
     // Member Functions
 
+        //- Read LESProperties dictionary
+        virtual bool read();
+
+        //- Return the effective diffusivity for nuTilda
+        tmp<volScalarField> DnuTildaEff() const;
+
         //- Return SGS kinetic energy
         virtual tmp<volScalarField> k() const;
 
-        //- Return sub-grid disipation rate
-        virtual tmp<volScalarField> epsilon() const;
-
         tmp<volScalarField> nuTilda() const
         {
             return nuTilda_;
         }
 
-        //- Return SGS viscosity
-        virtual tmp<volScalarField> nuSgs() const
-        {
-            return nuSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Correct nuTilda and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-
         //- Return the LES field indicator
         virtual tmp<volScalarField> LESRegion() const;
+
+        //- Correct nuTilda and related properties
+        virtual void correct();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "SpalartAllmarasDES.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
similarity index 54%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
rename to src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index eade16f38..f96cdc6a1 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -24,73 +24,63 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SpalartAllmarasIDDES.H"
-#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(SpalartAllmarasIDDES, 0);
-addToRunTimeSelectionTable(LESModel, SpalartAllmarasIDDES, dictionary);
-
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-tmp<volScalarField> SpalartAllmarasIDDES::alpha() const
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::alpha() const
 {
     return max
     (
-        0.25 - y_/static_cast<const volScalarField&>(hmax_()),
+        0.25 - this->y_/static_cast<const volScalarField&>(IDDESDelta_.hmax()),
         scalar(-5)
     );
 }
 
 
-tmp<volScalarField> SpalartAllmarasIDDES::ft
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::ft
 (
-    const volScalarField& S
+    const volScalarField& magGradU
 ) const
 {
-    return tanh(pow3(sqr(ct_)*rd(nuSgs_, S)));
+    return tanh(pow3(sqr(ct_)*rd(this->nut_, magGradU)));
 }
 
 
-tmp<volScalarField> SpalartAllmarasIDDES::fl
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fl
 (
-    const volScalarField& S
+    const volScalarField& magGradU
 ) const
 {
-    return tanh(pow(sqr(cl_)*rd(nu(), S), 10));
+    return tanh(pow(sqr(cl_)*rd(this->nu(), magGradU), 10));
 }
 
 
-tmp<volScalarField> SpalartAllmarasIDDES::rd
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::rd
 (
-    const volScalarField& visc,
-    const volScalarField& S
+    const volScalarField& nur,
+    const volScalarField& magGradU
 ) const
 {
     return min
     (
-        visc
+        nur
        /(
            max
            (
-               S,
-               dimensionedScalar("SMALL", S.dimensions(), SMALL)
-           )*sqr(kappa_*y_)
-         + dimensionedScalar
-           (
-               "ROOTVSMALL",
-               dimensionSet(0, 2 , -1, 0, 0),
-               ROOTVSMALL
-           )
+               magGradU,
+               dimensionedScalar("SMALL", magGradU.dimensions(), SMALL)
+           )*sqr(this->kappa_*this->y_)
        ),
        scalar(10)
     );
@@ -99,23 +89,34 @@ tmp<volScalarField> SpalartAllmarasIDDES::rd
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<volScalarField> SpalartAllmarasIDDES::fd(const volScalarField& S) const
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fd
+(
+    const volScalarField& magGradU
+) const
 {
-    return 1 - tanh(pow3(8*rd(nuEff(), S)));
+    return 1 - tanh(pow3(8*rd(this->nuEff(), magGradU)));
 }
 
 
-tmp<volScalarField> SpalartAllmarasIDDES::dTilda(const volScalarField& S) const
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::dTilda
+(
+    const volScalarField& chi,
+    const volScalarField& fv1,
+    const volTensorField& gradU
+) const
 {
     const volScalarField alpha(this->alpha());
     const volScalarField expTerm(exp(sqr(alpha)));
+    const volScalarField magGradU(mag(gradU));
 
     tmp<volScalarField> fHill =
         2*(pos(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.0));
 
     tmp<volScalarField> fStep = min(2*pow(expTerm, -9.0), scalar(1));
-    const volScalarField fHyb(max(1 - fd(S), fStep));
-    tmp<volScalarField> fAmp = 1 - max(ft(S), fl(S));
+    const volScalarField fHyb(max(1 - fd(magGradU), fStep));
+    tmp<volScalarField> fAmp = 1 - max(ft(magGradU), fl(magGradU));
     tmp<volScalarField> fRestore = max(fHill - 1, scalar(0))*fAmp;
 
     // IGNORING ft2 terms
@@ -126,7 +127,11 @@ tmp<volScalarField> SpalartAllmarasIDDES::dTilda(const volScalarField& S) const
             min
             (
                 scalar(100),
-                (1 - Cb1_/(Cw1_*sqr(kappa_)*fwStar_)*fv2())/max(SMALL, fv1())
+                (
+                    1
+                  - this->Cb1_*this->fv2(chi, fv1)
+                   /(this->Cw1_*sqr(this->kappa_)*fwStar_)
+                 )/max(SMALL, fv1)
             )
         )
     );
@@ -134,48 +139,43 @@ tmp<volScalarField> SpalartAllmarasIDDES::dTilda(const volScalarField& S) const
     return max
     (
         dimensionedScalar("SMALL", dimLength, SMALL),
-        fHyb*(1 + fRestore*Psi)*y_
-      + (1 - fHyb)*CDES_*Psi*delta()
+        fHyb*(1 + fRestore*Psi)*this->y_
+      + (1 - fHyb)*this->CDES_*Psi*this->delta()
     );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-SpalartAllmarasIDDES::SpalartAllmarasIDDES
+template<class BasicTurbulenceModel>
+SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
 (
+    const alphaField& alpha,
+    const rhoField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
+    const word& propertiesName,
+    const word& type
 )
 :
-    SpalartAllmaras(U, phi, transport, turbulenceModelName, modelName),
-    hmax_
+    SpalartAllmarasDES<BasicTurbulenceModel>
     (
-        LESdelta::New
-        (
-            "hmax",
-            mesh_,
-            *this
-        )
-    ),
-    IDDESDelta_
-    (
-        LESdelta::New
-        (
-            "IDDESDelta",
-            mesh_,
-            this->subDict(typeName + "Coeffs")
-        )
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
     ),
     fwStar_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "fwStar",
-            coeffDict_,
+            this->coeffDict_,
             0.424
         )
     ),
@@ -184,7 +184,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cl",
-            coeffDict_,
+            this->coeffDict_,
             3.55
         )
     ),
@@ -193,20 +193,24 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ct",
-            coeffDict_,
+            this->coeffDict_,
             1.63
         )
-    )
+    ),
+    IDDESDelta_(refCast<IDDESDelta>(this->delta_()))
 {}
 
 
-bool SpalartAllmarasIDDES::read()
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool SpalartAllmarasIDDES<BasicTurbulenceModel>::read()
 {
-    if (SpalartAllmaras::read())
+    if (SpalartAllmarasDES<BasicTurbulenceModel>::read())
     {
-        fwStar_.readIfPresent(coeffDict());
-        cl_.readIfPresent(coeffDict());
-        ct_.readIfPresent(coeffDict());
+        fwStar_.readIfPresent(this->coeffDict());
+        cl_.readIfPresent(this->coeffDict());
+        ct_.readIfPresent(this->coeffDict());
 
         return true;
     }
@@ -220,7 +224,6 @@ bool SpalartAllmarasIDDES::read()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
similarity index 63%
rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
rename to src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index 036d31913..2bfaf6089 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -22,13 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::LESModels::SpalartAllmarasIDDES
+    Foam::LESModels::SpalartAllmarasIDDES
 
 Group
-    grpIcoDESTurbulence
+    grpDESTurbulence
 
 Description
-    SpalartAllmarasIDDES LES turbulence model for incompressible flows
+    SpalartAllmaras IDDES turbulence model for incompressible and compressible
+    flows
+
+    Reference:
+    \verbatim
+        Shur, M. L., Spalart, P. R., Strelets, M. K., & Travin, A. K. (2008).
+        A hybrid RANS-LES approach with delayed-DES and wall-modelled LES
+        capabilities.
+        International Journal of Heat and Fluid Flow, 29(6), 1638-1649.
+    \endverbatim
 
 SourceFiles
     SpalartAllmarasIDDES.C
@@ -38,14 +47,13 @@ SourceFiles
 #ifndef SpalartAllmarasIDDES_H
 #define SpalartAllmarasIDDES_H
 
-#include "SpalartAllmaras.H"
+#include "SpalartAllmarasDES.H"
+#include "IDDESDelta.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace LESModels
 {
 
@@ -53,35 +61,38 @@ namespace LESModels
                         Class SpalartAllmarasIDDES Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class BasicTurbulenceModel>
 class SpalartAllmarasIDDES
 :
-    public SpalartAllmaras
+    public SpalartAllmarasDES<BasicTurbulenceModel>
 {
     // Private data
 
         // Model constants
 
-            autoPtr<Foam::LESdelta> hmax_;
-            autoPtr<Foam::LESdelta> IDDESDelta_;
             dimensionedScalar fwStar_;
             dimensionedScalar cl_;
             dimensionedScalar ct_;
 
+        // Fields
+
+            const IDDESDelta& IDDESDelta_;
+
 
     // Private Member Functions
 
         tmp<volScalarField> alpha() const;
-        tmp<volScalarField> ft(const volScalarField& S) const;
-        tmp<volScalarField> fl(const volScalarField& S) const;
+        tmp<volScalarField> ft(const volScalarField& magGradU) const;
+        tmp<volScalarField> fl(const volScalarField& magGradU) const;
 
         tmp<volScalarField> rd
         (
-            const volScalarField& visc,
-            const volScalarField& S
+            const volScalarField& nur,
+            const volScalarField& magGradU
         ) const;
 
         //- Delay function
-        tmp<volScalarField> fd(const volScalarField& S) const;
+        tmp<volScalarField> fd(const volScalarField& magGradU) const;
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmarasIDDES(const SpalartAllmarasIDDES&);
@@ -93,11 +104,21 @@ protected:
     // Protected Member Functions
 
         //- Length scale
-        virtual tmp<volScalarField> dTilda(const volScalarField& S) const;
+        virtual tmp<volScalarField> dTilda
+        (
+            const volScalarField& chi,
+            const volScalarField& fv1,
+            const volTensorField& gradU
+        ) const;
 
 
 public:
 
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
     //- Runtime type information
     TypeName("SpalartAllmarasIDDES");
 
@@ -107,11 +128,14 @@ public:
         //- Construct from components
         SpalartAllmarasIDDES
         (
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -122,12 +146,6 @@ public:
 
     // Member Functions
 
-        //- Access function to filter width
-        virtual const volScalarField& delta() const
-        {
-            return IDDESDelta_();
-        }
-
         //- Read LESProperties dictionary
         virtual bool read();
 };
@@ -136,11 +154,16 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "SpalartAllmarasIDDES.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/eddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/eddyViscosity/LESeddyViscosity.C
index b3d1c98f1..2a58c71e3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/eddyViscosity/LESeddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/eddyViscosity/LESeddyViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,6 +92,8 @@ bool LESeddyViscosity<BasicTurbulenceModel>::read()
 template<class BasicTurbulenceModel>
 tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
 {
+    tmp<volScalarField> tk(this->k());
+
     return tmp<volScalarField>
     (
         new volScalarField
@@ -104,7 +106,7 @@ tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
-            Ce_*this->k()*sqrt(this->k())/this->delta()
+            Ce_*tk()*sqrt(tk())/this->delta()
         )
     );
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
index 6a2a307da..b525666a7 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,6 @@ SourceFiles
 #ifndef kEqn_H
 #define kEqn_H
 
-#include "LESModel.H"
 #include "LESeddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -95,9 +94,14 @@ protected:
 
     // Protected data
 
-        volScalarField k_;
+        // Fields
 
-        dimensionedScalar Ck_;
+            volScalarField k_;
+
+
+        // Model constants
+
+            dimensionedScalar Ck_;
 
 
     // Protected Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/Make/files b/src/TurbulenceModels/turbulenceModels/Make/files
index 47c070ccb..0dffeeaa3 100644
--- a/src/TurbulenceModels/turbulenceModels/Make/files
+++ b/src/TurbulenceModels/turbulenceModels/Make/files
@@ -5,8 +5,10 @@ LESdelta = LES/LESdeltas
 $(LESdelta)/LESdelta/LESdelta.C
 $(LESdelta)/cubeRootVolDelta/cubeRootVolDelta.C
 $(LESdelta)/PrandtlDelta/PrandtlDelta.C
+$(LESdelta)/vanDriestDelta/vanDriestDelta.C
 $(LESdelta)/smoothDelta/smoothDelta.C
 $(LESdelta)/maxDeltaxyz/maxDeltaxyz.C
+$(LESdelta)/IDDESDelta/IDDESDelta.C
 
 LESfilters = LES/LESfilters
 
@@ -19,7 +21,7 @@ $(LESfilters)/anisotropicFilter/anisotropicFilter.C
 derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
 derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
 
-/* Wall functions */
+/* Wall function BCs */
 wallFunctions = RAS/derivedFvPatchFields/wallFunctions
 
 nutWallFunctions = $(wallFunctions)/nutWallFunctions
@@ -54,10 +56,14 @@ fWallFunctions = $(wallFunctions)/fWallFunctions
 $(fWallFunctions)/fWallFunction/fWallFunctionFvPatchScalarField.C
 */
 
-/* Patch fields */
+/* Inlet turbulence BCs */
 RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
 RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+
+/* Atmospheric boundary layer BCs */
+RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
 RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libturbulenceModels
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
new file mode 100644
index 000000000..61addc591
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -0,0 +1,310 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LaunderSharmaKE.H"
+#include "bound.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> LaunderSharmaKE<BasicTurbulenceModel>::fMu() const
+{
+    return exp(-3.4/sqr(scalar(1) + sqr(k_)/(this->nu()*epsilon_)/50.0));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> LaunderSharmaKE<BasicTurbulenceModel>::f2() const
+{
+    return
+        scalar(1)
+      - 0.3*exp(-min(sqr(sqr(k_)/(this->nu()*epsilon_)), scalar(50.0)));
+}
+
+
+template<class BasicTurbulenceModel>
+void LaunderSharmaKE<BasicTurbulenceModel>::correctNut()
+{
+    this->nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
+    this->nut_.correctBoundaryConditions();
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<fvScalarMatrix> LaunderSharmaKE<BasicTurbulenceModel>::kSource() const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            k_,
+            dimVolume*this->rho_.dimensions()*k_.dimensions()
+            /dimTime
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<fvScalarMatrix> LaunderSharmaKE<BasicTurbulenceModel>::epsilonSource() const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            epsilon_,
+            dimVolume*this->rho_.dimensions()*epsilon_.dimensions()
+            /dimTime
+        )
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
+(
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName,
+    const word& type
+)
+:
+    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    Cmu_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cmu",
+            this->coeffDict_,
+            0.09
+        )
+    ),
+    C1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C1",
+            this->coeffDict_,
+            1.44
+        )
+    ),
+    C2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C2",
+            this->coeffDict_,
+            1.92
+        )
+    ),
+    C3_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C3",
+            this->coeffDict_,
+            -0.33
+        )
+    ),
+    sigmak_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "sigmak",
+            this->coeffDict_,
+            1.0
+        )
+    ),
+    sigmaEps_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "sigmaEps",
+            this->coeffDict_,
+            1.3
+        )
+    ),
+
+    k_
+    (
+        IOobject
+        (
+            "k",
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    ),
+
+    epsilon_
+    (
+        IOobject
+        (
+            "epsilon",
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    )
+{
+    bound(k_, this->kMin_);
+    bound(epsilon_, this->epsilonMin_);
+
+    if (type == typeName)
+    {
+        correctNut();
+        this->printCoeffs(type);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool LaunderSharmaKE<BasicTurbulenceModel>::read()
+{
+    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    {
+        Cmu_.readIfPresent(this->coeffDict());
+        C1_.readIfPresent(this->coeffDict());
+        C2_.readIfPresent(this->coeffDict());
+        C3_.readIfPresent(this->coeffDict());
+        sigmak_.readIfPresent(this->coeffDict());
+        sigmaEps_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class BasicTurbulenceModel>
+void LaunderSharmaKE<BasicTurbulenceModel>::correct()
+{
+    if (!this->turbulence_)
+    {
+        return;
+    }
+
+    // Local references
+    const alphaField& alpha = this->alpha_;
+    const rhoField& rho = this->rho_;
+    const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+    const volVectorField& U = this->U_;
+    volScalarField& nut = this->nut_;
+
+    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+
+    volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
+
+    // Calculate parameters and coefficients for Launder-Sharma low-Reynolds
+    // number model
+
+    volScalarField E(2.0*this->nu()*nut*fvc::magSqrGradGrad(U));
+    volScalarField D(2.0*this->nu()*magSqr(fvc::grad(sqrt(k_))));
+
+    tmp<volTensorField> tgradU = fvc::grad(U);
+    volScalarField G(this->GName(), nut*(tgradU() && dev(twoSymm(tgradU()))));
+    tgradU.clear();
+
+
+    // Dissipation equation
+    tmp<fvScalarMatrix> epsEqn
+    (
+        fvm::ddt(alpha, rho, epsilon_)
+      + fvm::div(alphaRhoPhi, epsilon_)
+      - fvm::Sp(fvc::ddt(alpha, rho) + fvc::div(alphaRhoPhi), epsilon_)
+      - fvm::laplacian(alpha*rho*DepsilonEff(), epsilon_)
+     ==
+        C1_*alpha*rho*G*epsilon_/k_
+      - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*alpha*rho*divU, epsilon_)
+      - fvm::Sp(C2_*f2()*alpha*rho*epsilon_/k_, epsilon_)
+      + alpha*rho*E
+      + epsilonSource()
+    );
+
+    epsEqn().relax();
+    solve(epsEqn);
+    bound(epsilon_, this->epsilonMin_);
+
+
+    // Turbulent kinetic energy equation
+    tmp<fvScalarMatrix> kEqn
+    (
+        fvm::ddt(alpha, rho, k_)
+      + fvm::div(alphaRhoPhi, k_)
+      - fvm::Sp(fvc::ddt(alpha, rho) + fvc::div(alphaRhoPhi), k_)
+      - fvm::laplacian(alpha*rho*DkEff(), k_)
+     ==
+        alpha*rho*G - fvm::SuSp(2.0/3.0*alpha*rho*divU, k_)
+      - fvm::Sp(alpha*rho*(epsilon_ + D)/k_, k_)
+      + kSource()
+    );
+
+    kEqn().relax();
+    solve(kEqn);
+    bound(k_, this->kMin_);
+
+    correctNut();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
similarity index 65%
rename from src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
rename to src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index dd6fee6f1..8b67ea50f 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,27 +22,27 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::RASModels::LaunderSharmaKE
+    Foam::RASModels::LaunderSharmaKE
 
 Group
-    grpCmpRASTurbulence
+    grpRASTurbulence
 
 Description
     Launder and Sharma low-Reynolds k-epsilon turbulence model for
-    compressible and combusting flows including rapid distortion theory (RDT)
-    based compression term.
+    incompressible and compressible and combusting flows including
+    rapid distortion theory (RDT) based compression term.
 
     References:
     \verbatim
-        "Application of the Energy-Dissipation Model of Turbulence
-         to the Calculation of Flow Near a Spinning Disc",
-        Launder, B. E. and Sharma, B. I.,
-        Letters in Heat and Mass Transfer, Vol. 1, No. 2, 1974, pp 131-138.
+        Launder, B. E., & Sharma, B. I. (1974).
+        Application of the energy-dissipation model of turbulence to the
+        calculation of flow near a spinning disc.
+        Letters in heat and mass transfer, 1(2), 131-137.
 
         For the RDT-based compression term:
-        "k-epsilon equations for compressible reciprocating engine flows"
-        El Tahry, S. H.,
-        AIAA Journal of Energy 7, 1983, pp 345-353.
+        El Tahry, S. H. (1983).
+        k-epsilon equation for compressible reciprocating engine flows.
+        Journal of Energy, 7(4), 345-353.
     \endverbatim
 
     The default model coefficients correspond to the following:
@@ -64,17 +64,16 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleLaunderSharmaKE_H
-#define compressibleLaunderSharmaKE_H
+#ifndef LaunderSharmaKE_H
+#define LaunderSharmaKE_H
 
 #include "RASModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace compressible
-{
 namespace RASModels
 {
 
@@ -82,10 +81,17 @@ namespace RASModels
                         Class LaunderSharmaKE Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class BasicTurbulenceModel>
 class LaunderSharmaKE
 :
-    public RASModel
+    public eddyViscosity<RASModel<BasicTurbulenceModel> >
 {
+    // Private Member Functions
+
+        // Disallow default bitwise copy construct and assignment
+        LaunderSharmaKE(const LaunderSharmaKE&);
+        LaunderSharmaKE& operator=(const LaunderSharmaKE&);
+
 
 protected:
 
@@ -99,15 +105,12 @@ protected:
             dimensionedScalar C3_;
             dimensionedScalar sigmak_;
             dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
 
 
         // Fields
 
             volScalarField k_;
             volScalarField epsilon_;
-            volScalarField mut_;
-            volScalarField alphat_;
 
 
     // Private Member Functions
@@ -115,23 +118,35 @@ protected:
         tmp<volScalarField> fMu() const;
         tmp<volScalarField> f2() const;
 
+        virtual void correctNut();
+        virtual tmp<fvScalarMatrix> kSource() const;
+        virtual tmp<fvScalarMatrix> epsilonSource() const;
+
 
 public:
 
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
     //- Runtime type information
     TypeName("LaunderSharmaKE");
 
+
     // Constructors
 
         //- Construct from components
         LaunderSharmaKE
         (
-            const volScalarField& rho,
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -142,12 +157,19 @@ public:
 
     // Member Functions
 
+        //- Re-read model coefficients if they have changed
+        virtual bool read();
+
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", mut_/sigmak_ + mu())
+                new volScalarField
+                (
+                    "DkEff",
+                    (this->nut_/sigmak_ + this->nu())
+                )
             );
         }
 
@@ -156,22 +178,14 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
+                new volScalarField
+                (
+                    "DepsilonEff",
+                    (this->nut_/sigmaEps_ + this->nu())
+                )
             );
         }
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
         //- Return the turbulence kinetic energy
         virtual tmp<volScalarField> k() const
         {
@@ -184,31 +198,24 @@ public:
             return epsilon_;
         }
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace RASModels
-} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "LaunderSharmaKE.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index ada33eb5f..9dfd900c6 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
 :
     BasicTurbulenceModel
     (
+        type,
         alpha,
         rho,
         U,
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
index 51acd7687..7ecd22b2b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,12 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Namespace
-    Foam::RASModels
-
-Description
-    Namespace for RAS turbulence models.
-
 Class
     Foam::RASModel
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
new file mode 100644
index 000000000..c07e67715
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -0,0 +1,389 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpalartAllmaras.H"
+#include "bound.H"
+#include "wallDist.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::chi() const
+{
+    return nuTilda_/this->nu();
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::fv1
+(
+    const volScalarField& chi
+) const
+{
+    const volScalarField chi3(pow3(chi));
+    return chi3/(chi3 + pow3(Cv1_));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::fv2
+(
+    const volScalarField& chi,
+    const volScalarField& fv1
+) const
+{
+    return 1.0 - chi/(1.0 + chi*fv1);
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::Stilda
+(
+    const volScalarField& chi,
+    const volScalarField& fv1
+) const
+{
+    volScalarField Omega(::sqrt(2.0)*mag(skew(fvc::grad(this->U_))));
+
+    return
+    (
+        max
+        (
+            Omega
+          + fv2(chi, fv1)*nuTilda_/sqr(kappa_*y_),
+            Cs_*Omega
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::fw
+(
+    const volScalarField& Stilda
+) const
+{
+    volScalarField r
+    (
+        min
+        (
+            nuTilda_
+           /(
+               max
+               (
+                   Stilda,
+                   dimensionedScalar("SMALL", Stilda.dimensions(), SMALL)
+               )
+              *sqr(kappa_*y_)
+            ),
+            scalar(10.0)
+        )
+    );
+    r.boundaryField() == 0.0;
+
+    const volScalarField g(r + Cw2_*(pow6(r) - r));
+
+    return g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
+}
+
+
+template<class BasicTurbulenceModel>
+void SpalartAllmaras<BasicTurbulenceModel>::correctNut
+(
+    const volScalarField& fv1
+)
+{
+    this->nut_ = nuTilda_*fv1;
+    this->nut_.correctBoundaryConditions();
+}
+
+
+template<class BasicTurbulenceModel>
+void SpalartAllmaras<BasicTurbulenceModel>::correctNut()
+{
+    correctNut(fv1(this->chi()));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
+(
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName,
+    const word& type
+)
+:
+    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    sigmaNut_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "sigmaNut",
+            this->coeffDict_,
+            0.66666
+        )
+    ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            this->coeffDict_,
+            0.41
+        )
+    ),
+
+    Cb1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cb1",
+            this->coeffDict_,
+            0.1355
+        )
+    ),
+    Cb2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cb2",
+            this->coeffDict_,
+            0.622
+        )
+    ),
+    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
+    Cw2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cw2",
+            this->coeffDict_,
+            0.3
+        )
+    ),
+    Cw3_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cw3",
+            this->coeffDict_,
+            2.0
+        )
+    ),
+    Cv1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cv1",
+            this->coeffDict_,
+            7.1
+        )
+    ),
+    Cs_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cs",
+            this->coeffDict_,
+            0.3
+        )
+    ),
+
+    nuTilda_
+    (
+        IOobject
+        (
+            "nuTilda",
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    ),
+
+    y_(wallDist::New(this->mesh_).y())
+{
+    if (type == typeName)
+    {
+        correctNut();
+        this->printCoeffs(type);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool SpalartAllmaras<BasicTurbulenceModel>::read()
+{
+    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
+    {
+        sigmaNut_.readIfPresent(this->coeffDict());
+        kappa_.readIfPresent(this->coeffDict());
+
+        Cb1_.readIfPresent(this->coeffDict());
+        Cb2_.readIfPresent(this->coeffDict());
+        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
+        Cw2_.readIfPresent(this->coeffDict());
+        Cw3_.readIfPresent(this->coeffDict());
+        Cv1_.readIfPresent(this->coeffDict());
+        Cs_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::DnuTildaEff() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField("DnuTildaEff", (nuTilda_ + this->nu())/sigmaNut_)
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::k() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "k",
+                this->runTime_.timeName(),
+                this->mesh_
+            ),
+            this->mesh_,
+            dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::epsilon() const
+{
+    WarningIn("tmp<volScalarField> SpalartAllmaras::epsilon() const")
+        << "Turbulence kinetic energy dissipation rate not defined for "
+        << "Spalart-Allmaras model. Returning zero field"
+        << endl;
+
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "epsilon",
+                this->runTime_.timeName(),
+                this->mesh_
+            ),
+            this->mesh_,
+            dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+void SpalartAllmaras<BasicTurbulenceModel>::correct()
+{
+    if (!this->turbulence_)
+    {
+        return;
+    }
+
+    // Local references
+    const alphaField& alpha = this->alpha_;
+    const rhoField& rho = this->rho_;
+    const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+
+    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
+
+    const volScalarField chi(this->chi());
+    const volScalarField fv1(this->fv1(chi));
+
+    const volScalarField Stilda(this->Stilda(chi, fv1));
+
+    tmp<fvScalarMatrix> nuTildaEqn
+    (
+        fvm::ddt(alpha, rho, nuTilda_)
+      + fvm::div(alphaRhoPhi, nuTilda_)
+      - fvm::laplacian(alpha*rho*DnuTildaEff(), nuTilda_)
+      - Cb2_/sigmaNut_*alpha*rho*magSqr(fvc::grad(nuTilda_))
+     ==
+        Cb1_*alpha*rho*Stilda*nuTilda_
+      - fvm::Sp(Cw1_*alpha*rho*fw(Stilda)*nuTilda_/sqr(y_), nuTilda_)
+    );
+
+    nuTildaEqn().relax();
+    solve(nuTildaEqn);
+    bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
+    nuTilda_.correctBoundaryConditions();
+
+    correctNut(fv1);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
similarity index 68%
rename from src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
rename to src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
index 554ad12d3..b09a325d7 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -22,31 +22,31 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::RASModels::SpalartAllmaras
+    Foam::RASModels::SpalartAllmaras
 
 Group
-    grpIcoRASTurbulence
+    grpCmpRASTurbulence
 
 Description
-    Spalart-Allmaras 1-eqn mixing-length model for incompressible external
-    flows.
+    Spalart-Allmaras one-eqn mixing-length model for incompressible and
+    compressible external flows.
 
-    References:
+    Reference:
     \verbatim
-        "A One-Equation Turbulence Model for Aerodynamic Flows"
-        P.R. Spalart,
-        S.R. Allmaras,
-        La Recherche Aerospatiale, No. 1, 1994, pp. 5-21.
+        Spalart, P.R., & Allmaras, S.R. (1994).
+        A one-equation turbulence model for aerodynamic flows.
+        La Recherche Aerospatiale, 1, 5-21.
     \endverbatim
 
-    Extended according to
-    \verbatim
-        "An Unstructured Grid Generation and Adaptive Solution Technique
-        for High Reynolds Number Compressible Flows"
-        G.A. Ashford,
-        Ph.D. thesis, University of Michigan, 1996.
-    \endverbatim
-    using the optional flag \c ashfordCorrection
+    The model is implemented without the trip-term and hence the ft2 term is
+    not needed.
+
+    It is necessary to limit the Stilda generation term as the model generates
+    unphysical results if this term becomes negative which occurs for complex
+    flow.  Several approaches have been proposed to limit Stilda but it is not
+    clear which is the most appropriate.  Here the limiter proposed by Spalart
+    is implemented in which Stilda is clipped at Cs*Omega with the default value
+    of Cs = 0.3.
 
     The default model coefficients correspond to the following:
     \verbatim
@@ -57,7 +57,7 @@ Description
             Cw2         0.3;
             Cw3         2.0;
             Cv1         7.1;
-            Cv2         5.0;
+            Cs          0.3;
             sigmaNut    0.66666;
             kappa       0.41;
         }
@@ -72,25 +72,30 @@ SourceFiles
 #define SpalartAllmaras_H
 
 #include "RASModel.H"
-#include "wallDist.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class SpalartAllmaras Declaration
+                      Class SpalartAllmaras Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class BasicTurbulenceModel>
 class SpalartAllmaras
 :
-    public RASModel
+    public eddyViscosity<RASModel<BasicTurbulenceModel> >
 {
+    // Private Member Functions
+
+        // Disallow default bitwise copy construct and assignment
+        SpalartAllmaras(const SpalartAllmaras&);
+        SpalartAllmaras& operator=(const SpalartAllmaras&);
+
 
 protected:
 
@@ -107,17 +112,12 @@ protected:
             dimensionedScalar Cw2_;
             dimensionedScalar Cw3_;
             dimensionedScalar Cv1_;
-            dimensionedScalar Cv2_;
-
-
-        //- Optional flag to activate the Ashford correction
-        Switch ashfordCorrection_;
+            dimensionedScalar Cs_;
 
 
         // Fields
 
             volScalarField nuTilda_;
-            volScalarField nut_;
 
             //- Wall distance
             //  Note: different to wall distance in parent RASModel
@@ -137,7 +137,7 @@ protected:
             const volScalarField& fv1
         ) const;
 
-        tmp<volScalarField> fv3
+        tmp<volScalarField> Stilda
         (
             const volScalarField& chi,
             const volScalarField& fv1
@@ -145,9 +145,17 @@ protected:
 
         tmp<volScalarField> fw(const volScalarField& Stilda) const;
 
+        void correctNut(const volScalarField& fv1);
+        virtual void correctNut();
+
 
 public:
 
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
     //- Runtime type information
     TypeName("SpalartAllmaras");
 
@@ -157,11 +165,14 @@ public:
         //- Construct from components
         SpalartAllmaras
         (
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
         );
 
 
@@ -172,11 +183,8 @@ public:
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
+        //- Read RASProperties dictionary
+        virtual bool read();
 
         //- Return the effective diffusivity for nuTilda
         tmp<volScalarField> DnuTildaEff() const;
@@ -187,38 +195,24 @@ public:
         //- Return the turbulence kinetic energy dissipation rate
         virtual tmp<volScalarField> epsilon() const;
 
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace RASModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "SpalartAllmaras.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
similarity index 97%
rename from src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
rename to src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index 1c6ff3fcf..0ec408504 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,6 @@ License
 
 namespace Foam
 {
-namespace incompressible
-{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -176,7 +174,6 @@ void atmBoundaryLayer::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
similarity index 96%
rename from src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
rename to src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
index 50641ee0e..21e6e7bb2 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::atmBoundaryLayer
+    FoamFoam::atmBoundaryLayer
 
 Group
-    grpIcoRASBoundaryConditions grpInletBoundaryConditions
+    grpRASBoundaryConditions grpInletBoundaryConditions
 
 Description
     This class provides functions to evaluate the velocity and turbulence
@@ -122,8 +122,6 @@ SourceFiles
 
 namespace Foam
 {
-namespace incompressible
-{
 
 /*---------------------------------------------------------------------------*\
        Class atmBoundaryLayer Declaration
@@ -234,7 +232,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index d621d8884..9b04284c0 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,33 +44,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    z_(vector::zero),
-    kappa_(0.41),
-    Uref_(0),
-    Href_(0),
-    z0_(0),
-    zGround_(0),
-    Ustar_(0)
-{}
-
-
-atmBoundaryLayerInletEpsilonFvPatchScalarField::
-atmBoundaryLayerInletEpsilonFvPatchScalarField
-(
-    const atmBoundaryLayerInletEpsilonFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    z_(ptf.z_),
-    kappa_(ptf.kappa_),
-    Uref_(ptf.Uref_),
-    Href_(ptf.Href_),
-    z0_(ptf.z0_, mapper),
-    zGround_(ptf.zGround_, mapper),
-    Ustar_(ptf.Ustar_, mapper)
+    atmBoundaryLayer()
 {}
 
 
@@ -83,56 +57,35 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    z_(dict.lookup("z")),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    Uref_(readScalar(dict.lookup("Uref"))),
-    Href_(readScalar(dict.lookup("Href"))),
-    z0_("z0", dict, p.size()),
-    zGround_("zGround", dict, p.size()),
-    Ustar_(p.size())
+    atmBoundaryLayer(patch().Cf(), dict)
 {
-    if (mag(z_) < SMALL)
-    {
-        FatalErrorIn
-        (
-            "atmBoundaryLayerInletEpsilonFvPatchScalarField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<scalar, volMesh>&, "
-                "const dictionary&"
-            ")"
-        )
-            << "magnitude of z vector must be greater than zero"
-            << abort(FatalError);
-    }
-
-    forAll (Ustar_, i)
-    {
-        Ustar_[i] = kappa_*Uref_/(log((Href_  + z0_[i])/max(z0_[i] , 0.001)));
-    }
-
-    z_ /= mag(z_);
-
-    const vectorField& c = patch().Cf();
-    scalarField::operator=(pow3(Ustar_)/(kappa_*((c & z_) - zGround_ + z0_)));
+    scalarField::operator=(epsilon(patch().Cf()));
 }
 
 
 atmBoundaryLayerInletEpsilonFvPatchScalarField::
 atmBoundaryLayerInletEpsilonFvPatchScalarField
 (
-    const atmBoundaryLayerInletEpsilonFvPatchScalarField& blpsf,
+    const atmBoundaryLayerInletEpsilonFvPatchScalarField& psf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(psf, p, iF, mapper),
+    atmBoundaryLayer(psf, mapper)
+{}
+
+
+atmBoundaryLayerInletEpsilonFvPatchScalarField::
+atmBoundaryLayerInletEpsilonFvPatchScalarField
+(
+    const atmBoundaryLayerInletEpsilonFvPatchScalarField& psf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(blpsf, iF),
-    z_(blpsf.z_),
-    kappa_(blpsf.kappa_),
-    Uref_(blpsf.Uref_),
-    Href_(blpsf.Href_),
-    z0_(blpsf.z0_),
-    zGround_(blpsf.zGround_),
-    Ustar_(blpsf.Ustar_)
+    fixedValueFvPatchScalarField(psf, iF),
+    atmBoundaryLayer(psf)
 {}
 
 
@@ -144,42 +97,29 @@ void atmBoundaryLayerInletEpsilonFvPatchScalarField::autoMap
 )
 {
     fixedValueFvPatchScalarField::autoMap(m);
-    z0_.autoMap(m);
-    zGround_.autoMap(m);
-    Ustar_.autoMap(m);
+    atmBoundaryLayer::autoMap(m);
 }
 
 
 void atmBoundaryLayerInletEpsilonFvPatchScalarField::rmap
 (
-    const fvPatchScalarField& ptf,
+    const fvPatchScalarField& psf,
     const labelList& addr
 )
 {
-    fixedValueFvPatchScalarField::rmap(ptf, addr);
+    fixedValueFvPatchScalarField::rmap(psf, addr);
 
-    const atmBoundaryLayerInletEpsilonFvPatchScalarField& blptf =
-        refCast<const atmBoundaryLayerInletEpsilonFvPatchScalarField>(ptf);
+    const atmBoundaryLayerInletEpsilonFvPatchScalarField& blpsf =
+        refCast<const atmBoundaryLayerInletEpsilonFvPatchScalarField>(psf);
 
-    z0_.rmap(blptf.z0_, addr);
-    zGround_.rmap(blptf.zGround_, addr);
-    Ustar_.rmap(blptf.Ustar_, addr);
+    atmBoundaryLayer::rmap(blpsf, addr);
 }
 
 
 void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
-    os.writeKeyword("z")
-        << z_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa")
-        << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Uref")
-        << Uref_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Href")
-        << Href_ << token::END_STATEMENT << nl;
-    z0_.writeEntry("z0", os);
-    zGround_.writeEntry("zGround", os);
+    atmBoundaryLayer::write(os);
     writeEntry("value", os);
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
index f18ce28db..bc020fed3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,73 +22,34 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::atmBoundaryLayerInletEpsilonFvPatchScalarField
+    FoamFoam::atmBoundaryLayerInletEpsilonFvPatchScalarField
 
 Group
     grpRASBoundaryConditions grpInletBoundaryConditions
 
 Description
     This boundary condition specifies an inlet value for the turbulence
-    dissipation, \f$\epsilon\f$ (\c epsilon), appropriate for atmospheric
-    boundary layers (ABL), and designed to be used in conjunction with the
-    \c ABLInletVelocity inlet velocity boundary condition.
+    dissipation, \f$\epsilon\f$, appropriate for atmospheric boundary layers.
 
-        \f[
-            \epsilon = \frac{(U^*)^3}{K(z - z_g + z_0)}
-        \f]
-
-    where
-    \vartable
-        U^*     | frictional velocity
-        K       | Karman's constant
-        z       | vertical co-ordinate [m]
-        z_0     | surface roughness length [m]
-        z_g     | minimum vlaue in z direction [m]
-    \endvartable
-
-    and:
-
-        \f[
-            U^* = K \frac{U_{ref}}{ln\left(\frac{Z_{ref} + z_0}{z_0}\right)}
-        \f]
-
-    where:
-    \vartable
-        U_{ref} | reference velocity at \f$Z_{ref}\f$ [m/s]
-        Z_{ref} | reference height [m]
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        z            | vertical co-ordinate [m] | yes        |
-        kappa        | Karman's constanat      | no          | 0.41
-        Uref         | reference velocity [m/s] | yes        |
-        Href         | reference height [m]    | yes         |
-        z0           | surface roughness length [m] | yes    |
-        zGround      | minimum z co-ordinate [m] | yes       |
-    \endtable
+    See FoamFoam::atmBoundaryLayer for details.
 
     Example of the boundary condition specification:
     \verbatim
-    myPatch
+    ground
     {
         type            atmBoundaryLayerInletEpsilon;
-        z               1.0;
-        kappa           0.41;
-        Uref            1.0;
-        Href            0.0;
-        z0              uniform 0.0;
+        z               (0 0 1);
+        Uref            10.0;
+        Zref            20.0;
+        z0              uniform 0.1;
         zGround         uniform 0.0;
     }
     \endverbatim
 
-    Reference:
-        D.M. Hargreaves and N.G. Wright,  "On the use of the k-epsilon model
-        in commercial CFD software to model the neutral atmospheric boundary
-        layer", Journal of Wind Engineering and Industrial Aerodynamics
-        95(2007), pp 355-369.
+SeeAlso
+    FoamFoam::atmBoundaryLayer,
+    FoamFoam::atmBoundaryLayerInletVelocityFvPatchVectorField,
+    FoamFoam::atmBoundaryLayerInletKFvPatchScalarField
 
 SourceFiles
     atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -100,6 +61,7 @@ SourceFiles
 
 #include "fvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
+#include "atmBoundaryLayer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -112,31 +74,9 @@ namespace Foam
 
 class atmBoundaryLayerInletEpsilonFvPatchScalarField
 :
-    public fixedValueFvPatchScalarField
+    public fixedValueFvPatchScalarField,
+    public atmBoundaryLayer
 {
-    // Private data
-
-        //- Direction of the z-coordinate
-        vector z_;
-
-        //- Von Karman constant
-        const scalar kappa_;
-
-        //- Reference velocity
-        const scalar Uref_;
-
-        //- Reference height
-        const scalar Href_;
-
-        //- Surface roughness length
-        scalarField z0_;
-
-        //- Minimum co-ordinate value in z direction
-        scalarField zGround_;
-
-        //- Frictional velocity
-        scalarField Ustar_;
-
 
 public:
 
@@ -202,21 +142,6 @@ public:
 
     // Member functions
 
-        // Access
-
-            //- Return max value
-            const scalarField& Ustar() const
-            {
-                return Ustar_;
-            }
-
-            //- Return z direction
-            const vector& z() const
-            {
-                return z_;
-            }
-
-
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
similarity index 96%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
rename to src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index 3980ad27e..de2404ab1 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,8 +33,6 @@ License
 
 namespace Foam
 {
-namespace incompressible
-{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -136,7 +134,6 @@ makePatchTypeField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H
similarity index 91%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H
rename to src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H
index 7463fce17..cc95eca33 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H
@@ -22,16 +22,16 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::atmBoundaryLayerInletKFvPatchScalarField
+    Foam::atmBoundaryLayerInletKFvPatchScalarField
 
 Group
-    grpIcoRASBoundaryConditions grpInletBoundaryConditions
+    grpRASBoundaryConditions grpInletBoundaryConditions
 
 Description
     This boundary condition specifies an inlet value for the turbulence
     kinetic energy, \f$k\f$, appropriate for atmospheric boundary layers.
 
-    See Foam::incompressible::atmBoundaryLayer for details.
+    See Foam::atmBoundaryLayer for details.
 
     Example of the boundary condition specification:
     \verbatim
@@ -47,9 +47,9 @@ Description
     \endverbatim
 
 SeeAlso
-    Foam::incompressible::atmBoundaryLayer,
-    Foam::incompressible::atmBoundaryLayerInletVelocityFvPatchVectorField,
-    Foam::incompressible::atmBoundaryLayerInletEpsilonFvPatchScalarField
+    Foam::atmBoundaryLayer,
+    Foam::atmBoundaryLayerInletVelocityFvPatchVectorField,
+    Foam::atmBoundaryLayerInletEpsilonFvPatchScalarField
 
 SourceFiles
     atmBoundaryLayerInletKFvPatchScalarField.C
@@ -67,8 +67,6 @@ SourceFiles
 
 namespace Foam
 {
-namespace incompressible
-{
 
 /*---------------------------------------------------------------------------*\
         Class atmBoundaryLayerInletKFvPatchScalarField Declaration
@@ -167,7 +165,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 0966e5060..652b6e07b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,35 +44,7 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    Ustar_(0),
-    n_(pTraits<vector>::zero),
-    z_(pTraits<vector>::zero),
-    z0_(0),
-    kappa_(0.41),
-    Uref_(0),
-    Href_(0),
-    zGround_(0)
-{}
-
-
-atmBoundaryLayerInletVelocityFvPatchVectorField::
-atmBoundaryLayerInletVelocityFvPatchVectorField
-(
-    const atmBoundaryLayerInletVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
-    Ustar_(ptf.Ustar_, mapper),
-    n_(ptf.n_),
-    z_(ptf.z_),
-    z0_(ptf.z0_, mapper),
-    kappa_(ptf.kappa_),
-    Uref_(ptf.Uref_),
-    Href_(ptf.Href_),
-    zGround_(ptf.zGround_, mapper)
+    atmBoundaryLayer()
 {}
 
 
@@ -85,76 +57,35 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(p, iF),
-    Ustar_(p.size()),
-    n_(dict.lookup("n")),
-    z_(dict.lookup("z")),
-    z0_("z0", dict, p.size()),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    Uref_(readScalar(dict.lookup("Uref"))),
-    Href_(readScalar(dict.lookup("Href"))),
-    zGround_("zGround", dict, p.size())
+    atmBoundaryLayer(patch().Cf(), dict)
 {
-    if (mag(n_) < SMALL || mag(z_) < SMALL)
-    {
-        FatalErrorIn
-        (
-            "atmBoundaryLayerInletVelocityFvPatchVectorField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<vector, volMesh>&, "
-                "onst dictionary&"
-            ")"
-        )
-            << "magnitude of n or z must be greater than zero"
-            << abort(FatalError);
-    }
-
-    n_ /= mag(n_);
-    z_ /= mag(z_);
-
-    forAll (Ustar_, i)
-    {
-        Ustar_[i] = kappa_*Uref_/(log((Href_  + z0_[i])/max(z0_[i] , 0.001)));
-    }
-
-    const vectorField& c = patch().Cf();
-    const scalarField coord(c & z_);
-    scalarField Un(coord.size());
-
-    forAll(coord, i)
-    {
-        if ((coord[i] - zGround_[i]) < Href_)
-        {
-            Un[i] =
-                (Ustar_[i]/kappa_)
-              * log((coord[i] - zGround_[i] + z0_[i])/max(z0_[i], 0.001));
-        }
-        else
-        {
-            Un[i] = Uref_;
-        }
-    }
-
-    vectorField::operator=(n_*Un);
+    vectorField::operator=(U(patch().Cf()));
 }
 
 
 atmBoundaryLayerInletVelocityFvPatchVectorField::
 atmBoundaryLayerInletVelocityFvPatchVectorField
 (
-    const atmBoundaryLayerInletVelocityFvPatchVectorField& blpvf,
+    const atmBoundaryLayerInletVelocityFvPatchVectorField& pvf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(pvf, p, iF, mapper),
+    atmBoundaryLayer(pvf, mapper)
+{}
+
+
+atmBoundaryLayerInletVelocityFvPatchVectorField::
+atmBoundaryLayerInletVelocityFvPatchVectorField
+(
+    const atmBoundaryLayerInletVelocityFvPatchVectorField& pvf,
     const DimensionedField<vector, volMesh>& iF
 )
 :
-    fixedValueFvPatchVectorField(blpvf, iF),
-    Ustar_(blpvf.Ustar_),
-    n_(blpvf.n_),
-    z_(blpvf.z_),
-    z0_(blpvf.z0_),
-    kappa_(blpvf.kappa_),
-    Uref_(blpvf.Uref_),
-    Href_(blpvf.Href_),
-    zGround_(blpvf.zGround_)
+    fixedValueFvPatchVectorField(pvf, iF),
+    atmBoundaryLayer(pvf)
 {}
 
 
@@ -166,44 +97,29 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::autoMap
 )
 {
     fixedValueFvPatchVectorField::autoMap(m);
-    z0_.autoMap(m);
-    zGround_.autoMap(m);
-    Ustar_.autoMap(m);
+    atmBoundaryLayer::autoMap(m);
 }
 
 
 void atmBoundaryLayerInletVelocityFvPatchVectorField::rmap
 (
-    const fvPatchVectorField& ptf,
+    const fvPatchVectorField& pvf,
     const labelList& addr
 )
 {
-    fixedValueFvPatchVectorField::rmap(ptf, addr);
+    fixedValueFvPatchVectorField::rmap(pvf, addr);
 
-    const atmBoundaryLayerInletVelocityFvPatchVectorField& blptf =
-        refCast<const atmBoundaryLayerInletVelocityFvPatchVectorField>(ptf);
+    const atmBoundaryLayerInletVelocityFvPatchVectorField& blpvf =
+        refCast<const atmBoundaryLayerInletVelocityFvPatchVectorField>(pvf);
 
-    z0_.rmap(blptf.z0_, addr);
-    zGround_.rmap(blptf.zGround_, addr);
-    Ustar_.rmap(blptf.Ustar_, addr);
+    atmBoundaryLayer::rmap(blpvf, addr);
 }
 
 
 void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
-    z0_.writeEntry("z0", os) ;
-    os.writeKeyword("n")
-        << n_ << token::END_STATEMENT << nl;
-    os.writeKeyword("z")
-        << z_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa")
-        << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Uref")
-        << Uref_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Href")
-        << Href_ << token::END_STATEMENT << nl;
-    zGround_.writeEntry("zGround", os) ;
+    atmBoundaryLayer::write(os);
     writeEntry("value", os);
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
index b2f7245cc..ea93312fa 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,81 +22,35 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::atmBoundaryLayerInletVelocityFvPatchVectorField
+    FoamFoam::atmBoundaryLayerInletVelocityFvPatchVectorField
 
 Group
     grpRASBoundaryConditions grpInletBoundaryConditions
 
 Description
     This boundary condition specifies a velocity inlet profile appropriate
-    for atmospheric boundary layers (ABL).  The profile is derived from the
-    friction velocity, flow direction and the direction of the parabolic
-    co-ordinate \c z.
+    for atmospheric boundary layers (ABL).
 
-        \f[
-            U = \frac{U^*}{K} ln\left(\frac{z - z_g + z_0}{z_0}\right)
-        \f]
-
-    where
-    \vartable
-        U^*     | frictional velocity
-        K       | Karman's constant
-        z       | vertical co-ordinate [m]
-        z_0     | surface roughness length [m]
-        z_g     | minimum vlaue in z direction [m]
-    \endvartable
-
-    and:
-
-        \f[
-            U^* = K \frac{U_{ref}}{ln\left(\frac{Z_{ref} + z_0}{z_0}\right)}
-        \f]
-
-    where:
-    \vartable
-        U_{ref} | reference velocity at \f$Z_{ref}\f$ [m/s]
-        Z_{ref} | reference height [m]
-    \endvartable
-
-    Reference:
-        D.M. Hargreaves and N.G. Wright,  "On the use of the k-epsilon model
-        in commercial CFD software to model the neutral atmospheric boundary
-        layer", Journal of Wind Engineering and Industrial Aerodynamics
-        95(2007), pp 355-369.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        n            | flow direction          | yes         |
-        z            | vertical co-ordinate [m] | yes        |
-        kappa        | Karman's constanat      | no          | 0.41
-        Uref         | reference velocity [m/s] | yes        |
-        Href         | reference height [m]    | yes         |
-        z0           | surface roughness length [m] | yes    |
-        zGround      | minimum z co-ordinate [m] | yes       |
-    \endtable
+    See FoamFoam::atmBoundaryLayer for details.
 
     Example of the boundary condition specification:
     \verbatim
-    myPatch
+    ground
     {
         type            atmBoundaryLayerInletVelocity;
-        n               (0 1 0);
-        z               1.0;
-        kappa           0.41;
-        Uref            1.0;
-        Href            0.0;
-        z0              uniform 0.0;
+        n               (1 0 0);
+        z               (0 0 1);
+        Uref            10.0;
+        Zref            20.0;
+        z0              uniform 0.1;
         zGround         uniform 0.0;
     }
     \endverbatim
 
-Note
-    D.M. Hargreaves and N.G. Wright recommend Gamma epsilon in the
-    k-epsilon model should be changed from 1.3 to 1.11 for consistency.
-    The roughness height (Er) is given by Er = 20 z0 following the same
-    reference.
+SeeAlso
+    FoamFoam::atmBoundaryLayer,
+    FoamFoam::atmBoundaryLayerInletKFvPatchScalarField,
+    FoamFoam::atmBoundaryLayerInletEpsilonFvPatchScalarField
 
 SourceFiles
     atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -108,6 +62,7 @@ SourceFiles
 
 #include "fvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
+#include "atmBoundaryLayer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -120,34 +75,9 @@ namespace Foam
 
 class atmBoundaryLayerInletVelocityFvPatchVectorField
 :
-    public fixedValueFvPatchVectorField
+    public fixedValueFvPatchVectorField,
+    public atmBoundaryLayer
 {
-    // Private data
-
-        //- Frictional velocity
-        scalarField Ustar_;
-
-        //- Flow direction
-        vector n_;
-
-        //- Direction of the z-coordinate
-        vector z_;
-
-        //- Surface roughness lenght
-        scalarField z0_;
-
-        //- Von Karman constant
-        const scalar kappa_;
-
-        //- Reference velocity
-        const scalar Uref_;
-
-        //- Reference hight
-        const scalar Href_;
-
-        //- Minimum corrdinate value in z direction
-        scalarField zGround_;
-
 
 public:
 
@@ -213,27 +143,6 @@ public:
 
     // Member functions
 
-        // Access
-
-            //- Return Ustar
-            const scalarField& Ustar() const
-            {
-                return Ustar_;
-            }
-
-            //- Return flow direction
-            const vector& n() const
-            {
-                return n_;
-            }
-
-            //- Return z direction
-            const vector& z() const
-            {
-                return z_;
-            }
-
-
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
index 1b8ed898f..ce40a41ae 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "v2WallFunctionFvPatchScalarField.H"
+#include "turbulenceModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -52,6 +53,14 @@ void v2WallFunctionFvPatchScalarField::checkType()
 }
 
 
+void v2WallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
 scalar v2WallFunctionFvPatchScalarField::yPlusLam
 (
     const scalar kappa,
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index af1c1d003..f37b906a2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,6 +33,46 @@ namespace Foam
 namespace RASModels
 {
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+void kEpsilon<BasicTurbulenceModel>::correctNut()
+{
+    this->nut_ = Cmu_*sqr(k_)/epsilon_;
+    this->nut_.correctBoundaryConditions();
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<fvScalarMatrix> kEpsilon<BasicTurbulenceModel>::kSource() const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            k_,
+            dimVolume*this->rho_.dimensions()*k_.dimensions()
+            /dimTime
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<fvScalarMatrix> kEpsilon<BasicTurbulenceModel>::epsilonSource() const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            epsilon_,
+            dimVolume*this->rho_.dimensions()*epsilon_.dimensions()
+            /dimTime
+        )
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
@@ -174,44 +214,6 @@ bool kEpsilon<BasicTurbulenceModel>::read()
 }
 
 
-template<class BasicTurbulenceModel>
-void kEpsilon<BasicTurbulenceModel>::correctNut()
-{
-    this->nut_ = Cmu_*sqr(k_)/epsilon_;
-    this->nut_.correctBoundaryConditions();
-}
-
-
-template<class BasicTurbulenceModel>
-tmp<fvScalarMatrix> kEpsilon<BasicTurbulenceModel>::kSource() const
-{
-    return tmp<fvScalarMatrix>
-    (
-        new fvScalarMatrix
-        (
-            k_,
-            dimVolume*this->rho_.dimensions()*k_.dimensions()
-            /dimTime
-        )
-    );
-}
-
-
-template<class BasicTurbulenceModel>
-tmp<fvScalarMatrix> kEpsilon<BasicTurbulenceModel>::epsilonSource() const
-{
-    return tmp<fvScalarMatrix>
-    (
-        new fvScalarMatrix
-        (
-            epsilon_,
-            dimVolume*this->rho_.dimensions()*epsilon_.dimensions()
-            /dimTime
-        )
-    );
-}
-
-
 template<class BasicTurbulenceModel>
 void kEpsilon<BasicTurbulenceModel>::correct()
 {
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
index b0f1a3152..a5ea71e0e 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,24 +28,24 @@ Group
     grpRASTurbulence
 
 Description
-    Standard k-epsilon turbulence model for compressible flows
-    including rapid distortion theory (RDT) based compression term.
+    Standard k-epsilon turbulence model for incompressible and compressible
+    flows including rapid distortion theory (RDT) based compression term.
 
     Reference:
     \verbatim
         Standard model:
-            Launder, B.E., and Spalding, D.B.,
-            "Mathematical Models of Turbulence",
-            Academic Press, 1972.
+            Launder, B. E., & Spalding, D. B. (1972).
+            Lectures in mathematical models of turbulence.
 
-            Launder, B.E., and Spalding, D.B.,
-            "Computational Methods for Turbulent Flows",
-            Comp. Meth in Appl Mech & Eng'g, Vol 3, 1974, pp 269-289.
+            Launder, B. E., & Spalding, D. B. (1974).
+            The numerical computation of turbulent flows.
+            Computer methods in applied mechanics and engineering,
+            3(2), 269-289.
 
-        Compressible form including RDT-based compression term:
-            "k-epsilon equations for compressible reciprocating engine flows"
-            El Tahry, S. H.,
-            AIAA Journal of Energy 7, 1983, pp 345-353.
+        For the RDT-based compression term:
+            El Tahry, S. H. (1983).
+            k-epsilon equation for compressible reciprocating engine flows.
+            Journal of Energy, 7(4), 345-353.
     \endverbatim
 
     The default model coefficients correspond to the following:
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index 153518ff1..dcaf5882a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -32,19 +32,21 @@ Description
 
     Turbulence model described in:
     \verbatim
-        Menter, F., Esch, T.
-        "Elements of Industrial Heat Transfer Prediction"
-        16th Brazilian Congress of Mechanical Engineering (COBEM),
-        Nov. 2001
+        Menter, F. R. & Esch, T. (2001).
+        Elements of Industrial Heat Transfer Prediction.
+        16th Brazilian Congress of Mechanical Engineering (COBEM).
+
+        Menter, F. R., Kuntz, M., and Langtry, R. (2003).
+        Ten Years of Industrial Experience with the SST Turbulence Model.
+        Turbulence, Heat and Mass Transfer 4, ed: K. Hanjalic, Y. Nagano,
+        & M. Tummers, Begell House, Inc., 625 - 632.
     \endverbatim
 
     with the addition of the optional F3 term for rough walls from
     \verbatim
-        Hellsten, A.
+        Hellsten, A. (1998).
         "Some Improvements in Menter’s k-omega-SST turbulence model"
-        29th AIAA Fluid Dynamics Conference,
-        AIAA-98-2554,
-        June 1998.
+        29th AIAA Fluid Dynamics Conference, AIAA-98-2554.
     \endverbatim
 
     Note that this implementation is written in terms of alpha diffusion
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
new file mode 100644
index 000000000..345e69d2a
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
@@ -0,0 +1,221 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReynoldsStress.H"
+#include "fvc.H"
+#include "fvm.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::ReynoldsStress<BasicTurbulenceModel>::ReynoldsStress
+(
+    const word& modelName,
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    BasicTurbulenceModel
+    (
+        modelName,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    couplingFactor_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "couplingFactor",
+            this->coeffDict_,
+            0.0
+        )
+    ),
+
+    R_
+    (
+        IOobject
+        (
+            IOobject::groupName("R", U.group()),
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    ),
+
+    nut_
+    (
+        IOobject
+        (
+            IOobject::groupName("nut", U.group()),
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool Foam::ReynoldsStress<BasicTurbulenceModel>::read()
+{
+    return BasicTurbulenceModel::read();
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volSymmTensorField>
+Foam::ReynoldsStress<BasicTurbulenceModel>::R() const
+{
+    return R_;
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::ReynoldsStress<BasicTurbulenceModel>::k() const
+{
+    tmp<Foam::volScalarField> tk(tr(R_));
+    tk().rename("k");
+    return tk;
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volSymmTensorField>
+Foam::ReynoldsStress<BasicTurbulenceModel>::devRhoReff() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                IOobject::groupName("devRhoReff", this->U_.group()),
+                this->runTime_.timeName(),
+                this->mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            this->alpha_*this->rho_*R_
+          - (this->alpha_*this->rho_*this->nu())
+           *dev(twoSymm(fvc::grad(this->U_)))
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::ReynoldsStress<BasicTurbulenceModel>::divDevRhoReff
+(
+    volVectorField& U
+) const
+{
+    if (couplingFactor_.value() > 0.0)
+    {
+        return
+        (
+            fvc::div
+            (
+                this->alpha_*this->rho_*R_
+              + couplingFactor_
+               *this->alpha_*this->rho_*this->nut()*fvc::grad(U),
+                "div(devRhoReff)"
+            )
+          + fvc::laplacian
+            (
+                (1.0 - couplingFactor_)*this->alpha_*this->rho_*this->nut(),
+                U,
+                "laplacian(nuEff,U)"
+            )
+          - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
+          - fvc::div(this->alpha_*this->rho_*nu()*dev2(T(fvc::grad(U))))
+        );
+    }
+    else
+    {
+        return
+        (
+            fvc::div(this->alpha_*this->rho_*R_)
+          + fvc::laplacian
+            (
+                this->alpha_*this->rho_*this->nut(),
+                U,
+                "laplacian(nuEff,U)"
+            )
+          - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
+          - fvc::div(this->alpha_*this->rho_*nu()*dev2(T(fvc::grad(U))))
+        );
+    }
+
+    return
+    (
+      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
+      - fvc::div((this->alpha_*this->rho_*this->nuEff())*dev2(T(fvc::grad(U))))
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::ReynoldsStress<BasicTurbulenceModel>::divDevRhoReff
+(
+    const volScalarField& rho,
+    volVectorField& U
+) const
+{
+    return
+    (
+      - fvm::laplacian(this->alpha_*rho*this->nuEff(), U)
+      - fvc::div((this->alpha_*rho*this->nuEff())*dev2(T(fvc::grad(U))))
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+void Foam::ReynoldsStress<BasicTurbulenceModel>::correct()
+{
+    BasicTurbulenceModel::correct();
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
similarity index 52%
rename from src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
rename to src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
index ea8d4b266..9c27cc4c8 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,97 +22,112 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::laminar
+    Foam::ReynoldsStress
+
+Group
+    grpTurbulence
 
 Description
-    Turbulence model for laminar incompressible flow.
+    Reynolds-stress turbulence model base class
 
 SourceFiles
-    laminar.C
+    ReynoldsStress.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
-#define laminar_H
-
-#include "turbulenceModel.H"
+#ifndef ReynoldsStress_H
+#define ReynoldsStress_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
 
 /*---------------------------------------------------------------------------*\
-                           Class laminar Declaration
+                           Class ReynoldsStress Declaration
 \*---------------------------------------------------------------------------*/
 
-class laminar
+template<class BasicTurbulenceModel>
+class ReynoldsStress
 :
-    public turbulenceModel
+    public BasicTurbulenceModel
 {
 
+protected:
+
+    // Protected data
+
+        // Model coefficients
+
+            dimensionedScalar couplingFactor_;
+
+        // Fields
+
+            volSymmTensorField R_;
+            volScalarField nut_;
+
+
+    // Protected Member Functions
+
+        virtual void correctNut() = 0;
+
+
 public:
 
-    //- Runtime type information
-    TypeName("laminar");
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
 
     // Constructors
 
         //- Construct from components
-        laminar
+        ReynoldsStress
         (
+            const word& modelName,
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected turbulence model
-        static autoPtr<laminar> New
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& propertiesName
         );
 
 
     //- Destructor
-    virtual ~laminar()
+    virtual ~ReynoldsStress()
     {}
 
 
     // Member Functions
 
-        //- Const access to the coefficients dictionary
-        virtual const dictionary& coeffDict() const;
+        //- Re-read model coefficients if they have changed
+        virtual bool read() = 0;
 
-        //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> nut() const;
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> nut() const
+        {
+            return nut_;
+        }
 
-        //- Return the effective viscosity, i.e. the laminar viscosity
-        virtual tmp<volScalarField> nuEff() const;
+        //- Return the turbulence viscosity on patch
+        virtual tmp<scalarField> nut(const label patchi) const
+        {
+            return nut_.boundaryField()[patchi];
+        }
 
-        //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
+        //- Return the turbulence kinetic energy
         virtual tmp<volScalarField> k() const;
 
-        //- Return the turbulence kinetic energy dissipation rate,
-        //  i.e. 0 for laminar flow
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
+        //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor, i.e. the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
+        //- Return the effective stress tensor
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Return the source term for the momentum equation
         virtual tmp<fvVectorMatrix> divDevRhoReff
@@ -121,21 +136,23 @@ public:
             volVectorField& U
         ) const;
 
-        //- Correct the laminar viscosity
-        virtual void correct();
-
-        //- Read turbulenceProperties dictionary
-        virtual bool read();
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct() = 0;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "ReynoldsStress.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
index 1b98457bf..5ad9a350a 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 template<class BasicTurbulenceModel>
 Foam::eddyViscosity<BasicTurbulenceModel>::eddyViscosity
 (
-    const word& modelName,
+    const word& type,
     const alphaField& alpha,
     const rhoField& rho,
     const volVectorField& U,
@@ -42,9 +42,9 @@ Foam::eddyViscosity<BasicTurbulenceModel>::eddyViscosity
     const word& propertiesName
 )
 :
-    BasicTurbulenceModel
+    linearViscousStress<BasicTurbulenceModel>
     (
-        modelName,
+        type,
         alpha,
         rho,
         U,
@@ -71,6 +71,13 @@ Foam::eddyViscosity<BasicTurbulenceModel>::eddyViscosity
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class BasicTurbulenceModel>
+bool Foam::eddyViscosity<BasicTurbulenceModel>::read()
+{
+    return BasicTurbulenceModel::read();
+}
+
+
 template<class BasicTurbulenceModel>
 Foam::tmp<Foam::volSymmTensorField>
 Foam::eddyViscosity<BasicTurbulenceModel>::R() const
@@ -96,51 +103,6 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
 }
 
 
-template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volSymmTensorField>
-Foam::eddyViscosity<BasicTurbulenceModel>::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                IOobject::groupName("devRhoReff", this->U_.group()),
-                this->runTime_.timeName(),
-                this->mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            (-(this->alpha_*this->rho_*this->nuEff()))
-           *dev(twoSymm(fvc::grad(this->U_)))
-        )
-    );
-}
-
-
-template<class BasicTurbulenceModel>
-Foam::tmp<Foam::fvVectorMatrix>
-Foam::eddyViscosity<BasicTurbulenceModel>::divDevRhoReff
-(
-    volVectorField& U
-) const
-{
-    return
-    (
-      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
-      - fvc::div((this->alpha_*this->rho_*this->nuEff())*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-template<class BasicTurbulenceModel>
-bool Foam::eddyViscosity<BasicTurbulenceModel>::read()
-{
-    return BasicTurbulenceModel::read();
-}
-
-
 template<class BasicTurbulenceModel>
 void Foam::eddyViscosity<BasicTurbulenceModel>::correct()
 {
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
index d8070248e..ec92c7ba1 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::eddyViscosity
 
 Group
-    grpRASTurbulence
+    grpTurbulence
 
 Description
     Eddy viscosity turbulence model base class
@@ -38,6 +38,8 @@ SourceFiles
 #ifndef eddyViscosity_H
 #define eddyViscosity_H
 
+#include "linearViscousStress.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -50,7 +52,7 @@ namespace Foam
 template<class BasicTurbulenceModel>
 class eddyViscosity
 :
-    public BasicTurbulenceModel
+    public linearViscousStress<BasicTurbulenceModel>
 {
 
 protected:
@@ -118,12 +120,6 @@ public:
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 };
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
index eac733d49..b9528cd4a 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,8 +44,9 @@ Foam::laminar<BasicTurbulenceModel>::laminar
     const word& propertiesName
 )
 :
-    BasicTurbulenceModel
+    linearViscousStress<BasicTurbulenceModel>
     (
+        typeName,
         alpha,
         rho,
         U,
@@ -98,6 +99,13 @@ Foam::laminar<BasicTurbulenceModel>::coeffDict() const
 }
 
 
+template<class BasicTurbulenceModel>
+bool Foam::laminar<BasicTurbulenceModel>::read()
+{
+    return true;
+}
+
+
 template<class BasicTurbulenceModel>
 Foam::tmp<Foam::volScalarField>
 Foam::laminar<BasicTurbulenceModel>::nut() const
@@ -235,43 +243,6 @@ Foam::laminar<BasicTurbulenceModel>::R() const
 }
 
 
-template<class BasicTurbulenceModel>
-Foam::tmp<Foam::volSymmTensorField>
-Foam::laminar<BasicTurbulenceModel>::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                IOobject::groupName("devRhoReff", this->U_.group()),
-                this->runTime_.timeName(),
-                this->mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -(this->alpha_*this->rho_*nuEff())*dev(twoSymm(fvc::grad(this->U_)))
-        )
-    );
-}
-
-
-template<class BasicTurbulenceModel>
-Foam::tmp<Foam::fvVectorMatrix>
-Foam::laminar<BasicTurbulenceModel>::divDevRhoReff
-(
-    volVectorField& U
-) const
-{
-    return
-    (
-      - fvm::laplacian(this->alpha_*this->rho_*nuEff(), U)
-      - fvc::div(this->alpha_*this->rho_*nuEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
 template<class BasicTurbulenceModel>
 void Foam::laminar<BasicTurbulenceModel>::correct()
 {
@@ -279,11 +250,4 @@ void Foam::laminar<BasicTurbulenceModel>::correct()
 }
 
 
-template<class BasicTurbulenceModel>
-bool Foam::laminar<BasicTurbulenceModel>::read()
-{
-    return true;
-}
-
-
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.H b/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
index 260d4eb0a..07988089d 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef laminar_H
 #define laminar_H
 
-#include "TurbulenceModel.H"
+#include "linearViscousStress.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +49,7 @@ namespace Foam
 template<class BasicTurbulenceModel>
 class laminar
 :
-    public BasicTurbulenceModel
+    public linearViscousStress<BasicTurbulenceModel>
 {
 
 public:
@@ -103,6 +103,9 @@ public:
         //- Const access to the coefficients dictionary
         virtual const dictionary& coeffDict() const;
 
+        //- Read turbulenceProperties dictionary
+        virtual bool read();
+
         //- Return the turbulence viscosity, i.e. 0 for laminar flow
         virtual tmp<volScalarField> nut() const;
 
@@ -125,17 +128,8 @@ public:
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor, i.e. the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
         //- Correct the laminar viscosity
         virtual void correct();
-
-        //- Read turbulenceProperties dictionary
-        virtual bool read();
 };
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
new file mode 100644
index 000000000..1ac59915c
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "linearViscousStress.H"
+#include "fvc.H"
+#include "fvm.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::linearViscousStress<BasicTurbulenceModel>::linearViscousStress
+(
+    const word& modelName,
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    BasicTurbulenceModel
+    (
+        modelName,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool Foam::linearViscousStress<BasicTurbulenceModel>::read()
+{
+    return BasicTurbulenceModel::read();
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volSymmTensorField>
+Foam::linearViscousStress<BasicTurbulenceModel>::devRhoReff() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                IOobject::groupName("devRhoReff", this->U_.group()),
+                this->runTime_.timeName(),
+                this->mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            (-(this->alpha_*this->rho_*this->nuEff()))
+           *dev(twoSymm(fvc::grad(this->U_)))
+        )
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::linearViscousStress<BasicTurbulenceModel>::divDevRhoReff
+(
+    volVectorField& U
+) const
+{
+    return
+    (
+      - fvm::laplacian(this->alpha_*this->rho_*this->nuEff(), U)
+      - fvc::div((this->alpha_*this->rho_*this->nuEff())*dev2(T(fvc::grad(U))))
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::linearViscousStress<BasicTurbulenceModel>::divDevRhoReff
+(
+    const volScalarField& rho,
+    volVectorField& U
+) const
+{
+    return
+    (
+      - fvm::laplacian(this->alpha_*rho*this->nuEff(), U)
+      - fvc::div((this->alpha_*rho*this->nuEff())*dev2(T(fvc::grad(U))))
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+void Foam::linearViscousStress<BasicTurbulenceModel>::correct()
+{
+    BasicTurbulenceModel::correct();
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H
similarity index 53%
rename from src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
rename to src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H
index f715bd0f1..0a8f0e856 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
+++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,121 +22,100 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::LESModels::Smagorinsky2
+    Foam::linearViscousStress
 
 Group
-    grpIcoLESTurbulence
+    grpTurbulence
 
 Description
-    The Isochoric Smagorinsky Model for incompressible flows
-
-    Algebraic eddy viscosity SGS model founded on the assumption that
-    local equilibrium prevails, hence
-    \verbatim
-        B = 2/3*k*I - 2*nuSgs*dev(D) - 2*cD2*delta*(D.dev(D));
-        Beff = 2/3*k*I - 2*nuEff*dev(D) - 2*cD2*delta*(D.dev(D));
-
-    where
-
-        D = symm(grad(U));
-        k = cI*delta^2*||D||^2
-        nuSgs = ck*sqrt(k)*delta
-        nuEff = nuSgs + nu
-    \endverbatim
+    Linear viscous stress turbulence model base class
 
 SourceFiles
-    Smagorinsky2.C
+    linearViscousStress.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Smagorinsky2_H
-#define Smagorinsky2_H
-
-#include "Smagorinsky.H"
+#ifndef linearViscousStress_H
+#define linearViscousStress_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
-namespace LESModels
-{
 
 /*---------------------------------------------------------------------------*\
-                           Class Smagorinsky2 Declaration
+                           Class linearViscousStress Declaration
 \*---------------------------------------------------------------------------*/
 
-class Smagorinsky2
+template<class BasicTurbulenceModel>
+class linearViscousStress
 :
-    public Smagorinsky
+    public BasicTurbulenceModel
 {
-    // Private data
-
-        dimensionedScalar cD2_;
-
-
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        Smagorinsky2(const Smagorinsky2&);
-        Smagorinsky2& operator=(const Smagorinsky2&);
-
 
 public:
 
-    //- Runtime type information
-    TypeName("Smagorinsky2");
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
 
 
     // Constructors
 
         //- Construct from components
-        Smagorinsky2
+        linearViscousStress
         (
+            const word& modelName,
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName
         );
 
 
     //- Destructor
-    virtual ~Smagorinsky2()
+    virtual ~linearViscousStress()
     {}
 
 
     // Member Functions
 
-        //- Return B.
-        virtual tmp<volSymmTensorField> B() const;
+        //- Re-read model coefficients if they have changed
+        virtual bool read() = 0;
 
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        //- Return the effective stress tensor
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+
+        //- Return the source term for the momentum equation
         virtual tmp<fvVectorMatrix> divDevRhoReff
         (
             const volScalarField& rho,
             volVectorField& U
         ) const;
 
-        //- Read LESProperties dictionary
-        virtual bool read();
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct() = 0;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace LESModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "linearViscousStress.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
new file mode 100644
index 000000000..c24ac4d6c
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "nonlinearEddyViscosity.H"
+#include "fvc.H"
+#include "fvm.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::nonlinearEddyViscosity
+(
+    const word& modelName,
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    eddyViscosity<BasicTurbulenceModel>
+    (
+        modelName,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    nonlinearStress_
+    (
+        IOobject
+        (
+            IOobject::groupName("nonlinearStress", U.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        this->mesh_,
+        dimensionedSymmTensor
+        (
+            "nonlinearStress",
+            sqr(dimVelocity),
+            symmTensor::zero
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volSymmTensorField>
+Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::R() const
+{
+    tmp<volSymmTensorField> tR
+    (
+        eddyViscosity<BasicTurbulenceModel>::R()
+    );
+    tR() += nonlinearStress_;
+    return tR;
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volSymmTensorField>
+Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::devRhoReff() const
+{
+    tmp<volSymmTensorField> tdevRhoReff
+    (
+        eddyViscosity<BasicTurbulenceModel>::devRhoReff()
+    );
+    tdevRhoReff() += this->rho_*nonlinearStress_;
+    return tdevRhoReff;
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::divDevRhoReff
+(
+    volVectorField& U
+) const
+{
+    return
+    (
+        fvc::div(this->rho_*nonlinearStress_)
+      + eddyViscosity<BasicTurbulenceModel>::divDevRhoReff(U)
+    );
+}
+
+
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::fvVectorMatrix>
+Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::divDevRhoReff
+(
+    const volScalarField& rho,
+    volVectorField& U
+) const
+{
+    return
+    (
+        fvc::div(rho*nonlinearStress_)
+      + eddyViscosity<BasicTurbulenceModel>::divDevRhoReff(rho, U)
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H
similarity index 56%
rename from src/turbulenceModels/incompressible/RAS/laminar/laminar.H
rename to src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H
index 790593418..da8a24a05 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
+++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,91 +22,91 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::RASModels::laminar
+    Foam::nonlinearEddyViscosity
 
 Group
-    grpIcoRASTurbulence
+    grpTurbulence
 
 Description
-    Dummy turbulence model for laminar incompressible flow.
+    Eddy viscosity turbulence model with non-linear correction base class
 
 SourceFiles
-    laminar.C
+    nonlinearEddyViscosity.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef rasLaminar_H
-#define rasLaminar_H
+#ifndef nonlinearEddyViscosity_H
+#define nonlinearEddyViscosity_H
 
-#include "RASModel.H"
+#include "eddyViscosity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace incompressible
-{
-namespace RASModels
-{
 
 /*---------------------------------------------------------------------------*\
-                           Class laminar Declaration
+                           Class nonlinearEddyViscosity Declaration
 \*---------------------------------------------------------------------------*/
 
-class laminar
+template<class BasicTurbulenceModel>
+class nonlinearEddyViscosity
 :
-    public RASModel
+    public eddyViscosity<BasicTurbulenceModel>
 {
 
+protected:
+
+    // Protected data
+
+        // Fields
+
+            volSymmTensorField nonlinearStress_;
+
+
+    // Protected Member Functions
+
+        virtual void correctNonlinearStress(const volTensorField& gradU) = 0;
+
+
 public:
 
-    //- Runtime type information
-    TypeName("laminar");
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
 
     // Constructors
 
         //- Construct from components
-        laminar
+        nonlinearEddyViscosity
         (
+            const word& modelName,
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
+            const word& propertiesName
         );
 
 
     //- Destructor
-    virtual ~laminar()
+    virtual ~nonlinearEddyViscosity()
     {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> nut() const;
-
-        //- Return the effective viscosity, i.e. the laminar viscosity
-        virtual tmp<volScalarField> nuEff() const
-        {
-            return tmp<volScalarField>(new volScalarField("nuEff", nu()));
-        }
-
-        //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> k() const;
-
-        //- Return the turbulence kinetic energy dissipation rate,
-        //  i.e. 0 for laminar flow
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
+        //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor, i.e. the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
+        //- Return the effective stress tensor
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Return the source term for the momentum equation
         virtual tmp<fvVectorMatrix> divDevRhoReff
@@ -114,23 +114,21 @@ public:
             const volScalarField& rho,
             volVectorField& U
         ) const;
-
-        //- Correct the laminar viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RASModels
-} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "nonlinearEddyViscosity.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
index bc09825f9..e2177bb72 100644
--- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,9 @@ License
 Class
     Foam::turbulenceModel
 
+Group
+    grpTurbulence
+
 Description
     Abstract base class for turbulence models (RAS, LES and laminar).
 
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModelDoc.H b/src/TurbulenceModels/turbulenceModels/turbulenceModelDoc.H
index 739af7388..91eab7254 100644
--- a/src/TurbulenceModels/turbulenceModels/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/turbulenceModels/turbulenceModelDoc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,9 +23,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpIcoTurbulence Incompressible turbulence
+\defgroup grpTurbulence Turbulence
 @{
-    This group contains incompressible turbulence models.
+    This group contains turbulence models.
 @}
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C
index 307d2410c..85b0f21b8 100644
--- a/src/combustionModels/FSD/FSD.C
+++ b/src/combustionModels/FSD/FSD.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,8 @@ License
 #include "FSD.H"
 #include "addToRunTimeSelectionTable.H"
 #include "LESModel.H"
+#include "fvcGrad.H"
+#include "fvcDiv.H"
 
 namespace Foam
 {
diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options
index 29d5e7e6a..daf8e6d2e 100644
--- a/src/combustionModels/Make/options
+++ b/src/combustionModels/Make/options
@@ -3,14 +3,12 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/turbulenceModels/ \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESfilters/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lchemistryModel
diff --git a/src/combustionModels/PaSR/PaSR.H b/src/combustionModels/PaSR/PaSR.H
index 6d5a1ffd9..7ca8a5107 100644
--- a/src/combustionModels/PaSR/PaSR.H
+++ b/src/combustionModels/PaSR/PaSR.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ SourceFiles
 #ifndef PaSR_H
 #define PaSR_H
 
-#include "laminar.H"
+#include "../laminar/laminar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
index 3f887c8de..f46072820 100644
--- a/src/combustionModels/combustionModel/combustionModel.H
+++ b/src/combustionModels/combustionModel/combustionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ SourceFiles
 #define combustionModel_H
 
 #include "IOdictionary.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options
index d4edb5931..124084c05 100644
--- a/src/fvOptions/Make/options
+++ b/src/fvOptions/Make/options
@@ -6,13 +6,12 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels
-
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
-    /*-lsolidThermo*/ \
-    -lcompressibleTurbulenceModel
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
index cf96fa043..a9fc1e279 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "variableHeatTransfer.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -103,7 +103,10 @@ void Foam::fv::variableHeatTransfer::calculateHtc()
         mesh_.time().lookupObject<fvMesh>(nbrRegionName());
 
     const compressible::turbulenceModel& nbrTurb =
-        nbrMesh.lookupObject<compressible::turbulenceModel>("turbulenceModel");
+        nbrMesh.lookupObject<compressible::turbulenceModel>
+        (
+            turbulenceModel::propertiesName
+        );
 
     const fluidThermo& nbrThermo =
         nbrMesh.lookupObject<fluidThermo>("thermophysicalProperties");
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 1f00dde89..66d1baaba 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -11,7 +11,6 @@ wmake $targetType basic
 wmake $targetType solidParticle
 wmake $targetType intermediate
 wmake $targetType turbulence
-wmake $targetType Turbulence
 wmake $targetType spray
 wmake $targetType dsmc
 wmake $targetType coalCombustion
diff --git a/src/lagrangian/Turbulence/Make/options b/src/lagrangian/Turbulence/Make/options
index 3aed62832..d3d76c7b6 100644
--- a/src/lagrangian/Turbulence/Make/options
+++ b/src/lagrangian/Turbulence/Make/options
@@ -14,6 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
diff --git a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.H b/src/lagrangian/Turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
similarity index 77%
rename from src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.H
rename to src/lagrangian/Turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
index c5dcfccda..66e977a0a 100644
--- a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.H
+++ b/src/lagrangian/Turbulence/parcels/include/makeThermoParcelTurbulenceForces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,25 +23,19 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef porousBafflePressureFvPatchFields_H
-#define porousBafflePressureFvPatchFields_H
-
-#include "porousBafflePressureFvPatchField.H"
-#include "fieldTypes.H"
+#ifndef makeThermoParcelTurbulenceForces_h
+#define makeThermoParcelTurbulenceForces_h
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
+#include "BrownianMotionForce.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define makeThermoParcelTurbulenceForces(CloudType)                           \
+                                                                              \
+    makeParticleForceModelType(BrownianMotionForce, CloudType);
 
-makePatchTypeFieldTypedefs(porousBafflePressure);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/Turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/Turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 43b1b3669..80aa02213 100644
--- a/src/lagrangian/Turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/Turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "DispersionRASModel.H"
 #include "demandDrivenData.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
diff --git a/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
new file mode 100644
index 000000000..e479250d9
--- /dev/null
+++ b/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "BrownianMotionForce.H"
+#include "mathematicalConstants.H"
+#include "demandDrivenData.H"
+#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/turbulenceModel/turbulenceModel.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::scalar Foam::BrownianMotionForce<CloudType>::erfInv(const scalar y) const
+{
+    const scalar a = 0.147;
+    scalar k = 2.0/(mathematical::pi*a) +  0.5*log(1.0 - y*y);
+    scalar h = log(1.0 - y*y)/a;
+    scalar x = sqrt(-k + sqrt(k*k - h));
+
+    if (y < 0.0)
+    {
+        return -x;
+    }
+    else
+    {
+        return x;
+    }
+}
+
+
+template<class CloudType>
+Foam::tmp<Foam::volScalarField>
+Foam::BrownianMotionForce<CloudType>::kModel() const
+{
+    const objectRegistry& obr = this->owner().mesh();
+    const word turbName = "turbulenceModel";
+
+    if (obr.foundObject<compressible::turbulenceModel>(turbName))
+    {
+        const compressible::turbulenceModel& model =
+            obr.lookupObject<compressible::turbulenceModel>(turbName);
+        return model.k();
+    }
+    else if (obr.foundObject<incompressible::turbulenceModel>(turbName))
+    {
+        const incompressible::turbulenceModel& model =
+            obr.lookupObject<incompressible::turbulenceModel>(turbName);
+        return model.k();
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "Foam::tmp<Foam::volScalarField>"
+            "Foam::BrownianMotionForce<CloudType>::kModel() const"
+        )
+            << "Turbulence model not found in mesh database" << nl
+            << "Database objects include: " << obr.sortedToc()
+            << abort(FatalError);
+
+        return tmp<volScalarField>(NULL);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
+(
+    CloudType& owner,
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+:
+    ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
+    rndGen_(owner.rndGen()),
+    lambda_(readScalar(this->coeffs().lookup("lambda"))),
+    turbulence_(readBool(this->coeffs().lookup("turbulence"))),
+    kPtr_(NULL),
+    ownK_(false)
+{}
+
+
+template<class CloudType>
+Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
+(
+    const BrownianMotionForce& bmf
+)
+:
+    ParticleForce<CloudType>(bmf),
+    rndGen_(bmf.rndGen_),
+    lambda_(bmf.lambda_),
+    turbulence_(bmf.turbulence_),
+    kPtr_(NULL),
+    ownK_(false)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::BrownianMotionForce<CloudType>::~BrownianMotionForce()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::BrownianMotionForce<CloudType>::cacheFields(const bool store)
+{
+    if (turbulence_)
+    {
+        if (store)
+        {
+            tmp<volScalarField> tk = kModel();
+            if (tk.isTmp())
+            {
+                kPtr_ = tk.ptr();
+                ownK_ = true;
+            }
+            else
+            {
+                kPtr_ = tk.operator->();
+                ownK_ = false;
+            }
+        }
+        else
+        {
+            if (ownK_ && kPtr_)
+            {
+                deleteDemandDrivenData(kPtr_);
+                ownK_ = false;
+            }
+        }
+    }
+}
+
+
+template<class CloudType>
+Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
+(
+    const typename CloudType::parcelType& p,
+    const scalar dt,
+    const scalar mass,
+    const scalar Re,
+    const scalar muc
+) const
+{
+    forceSuSp value(vector::zero, 0.0);
+
+    const scalar dp = p.d();
+    const scalar Tc = p.Tc();
+
+    const scalar eta = rndGen_.sample01<scalar>();
+    const scalar alpha = 2.0*lambda_/dp;
+    const scalar cc = 1.0 + alpha*(1.257 + 0.4*exp(-1.1/alpha));
+
+    const scalar sigma = physicoChemical::sigma.value();
+
+    scalar f = 0.0;
+    if (turbulence_)
+    {
+        const label cellI = p.cell();
+        const volScalarField& k = *kPtr_;
+        const scalar kc = k[cellI];
+        const scalar Dp = sigma*Tc*cc/(3*mathematical::pi*muc*dp);
+        f = eta/mass*sqrt(2.0*sqr(kc)*sqr(Tc)/(Dp*dt));
+    }
+    else
+    {
+        const scalar rhoRatio = p.rho()/p.rhoc();
+        const scalar s0 =
+            216*muc*sigma*Tc/(sqr(mathematical::pi)*pow5(dp)*(rhoRatio)*cc);
+        f = eta*sqrt(mathematical::pi*s0/dt);
+    }
+
+    const scalar sqrt2 = sqrt(2.0);
+    for (label i = 0; i < 3; i++)
+    {
+        const scalar x = rndGen_.sample01<scalar>();
+        const scalar eta = sqrt2*erfInv(2*x - 1.0);
+        value.Su()[i] = mass*f*eta;
+    }
+
+    return value;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
new file mode 100644
index 000000000..c9434117d
--- /dev/null
+++ b/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
+
+Class
+    Foam::BrownianMotionForce
+
+Description
+    Calculates particle Brownian motion force
+
+SourceFiles
+    BrownianMotionForceI.H
+    BrownianMotionForce.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BrownianMotionForce_H
+#define BrownianMotionForce_H
+
+#include "ParticleForce.H"
+#include "cachedRandom.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class BrownianMotionForce Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class BrownianMotionForce
+:
+    public ParticleForce<CloudType>
+{
+    // Private data
+
+        //- Reference to the cloud random number generator
+        cachedRandom& rndGen_;
+
+        //- Molecular free path length [m]
+        const scalar lambda_;
+
+        //- Turbulence flag
+        bool turbulence_;
+
+        //- Pointer to the turbulence kinetic energy field
+        const volScalarField* kPtr_;
+
+        //- Flag that indicates ownership of turbulence k field
+        bool ownK_;
+
+
+    // Private Member Functions
+
+        //- Inverse erf for Gaussian distribution
+        scalar erfInv(const scalar y) const;
+
+        //- Return the k field from the turbulence model
+        tmp<volScalarField> kModel() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("BrownianMotion");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        BrownianMotionForce
+        (
+            CloudType& owner,
+            const fvMesh& mesh,
+            const dictionary& dict
+        );
+
+        //- Construct copy
+        BrownianMotionForce(const BrownianMotionForce& bmf);
+
+        //- Construct and return a clone
+        virtual autoPtr<ParticleForce<CloudType> > clone() const
+        {
+            return autoPtr<ParticleForce<CloudType> >
+            (
+                new BrownianMotionForce<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~BrownianMotionForce();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the molecular free path length [m]
+            inline scalar lambda() const;
+
+            //- Return const access to the turbulence flag
+            inline bool turbulence() const;
+
+
+        // Evaluation
+
+            //- Cache fields
+            virtual void cacheFields(const bool store);
+
+            //- Calculate the non-coupled force
+            virtual forceSuSp calcCoupled
+            (
+                const typename CloudType::parcelType& p,
+                const scalar dt,
+                const scalar mass,
+                const scalar Re,
+                const scalar muc
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "BrownianMotionForceI.H"
+
+#ifdef NoRepository
+    #include "BrownianMotionForce.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModelDoc.H b/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H
similarity index 74%
rename from src/turbulenceModels/compressible/RAS/RASModel/RASModelDoc.H
rename to src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H
index 53757f814..0c93d981b 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModelDoc.H
+++ b/src/lagrangian/Turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,12 +21,22 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+\*---------------------------------------------------------------------------*/
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-\defgroup grpCmpRASTurbulence Compressible RAS turbulence
-@{
-    \ingroup grpCmpTurbulence
-    This group contains compressible RAS models.
-@}
-    
-\*---------------------------------------------------------------------------*/
+template<class CloudType>
+inline Foam::scalar Foam::BrownianMotionForce<CloudType>::lambda() const
+{
+    return lambda_;
+}
+
+
+template<class CloudType>
+inline bool Foam::BrownianMotionForce<CloudType>::turbulence() const
+{
+    return turbulence_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 0f4bce678..a67fc6200 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -13,7 +13,9 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -35,10 +37,9 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
index b959d7f75..98a31411a 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ Foam::scalar Foam::COxidationHurtMitchell<CloudType>::calculate
 
     // Far field partial pressure O2 [Pa]
     // Note: Should really use the surface partial pressure
-    const scalar ppO2 = max(0.0, rhoc*YO2/WO2_*specie::RR*Tc);
+    const scalar ppO2 = max(0.0, rhoc*YO2/WO2_*RR*Tc);
 
     // Activation energy [kcal/mol]
     const scalar E = -5.94 + 0.355*charPrc;
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
index 817f57e50..174734fa2 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,10 +176,10 @@ Foam::scalar Foam::COxidationIntrinsicRate<CloudType>::calculate
     const scalar rhoO2 = rhoc*YO2;
 
     // Partial pressure O2 [Pa]
-    const scalar ppO2 = rhoO2/WO2_*specie::RR*Tc;
+    const scalar ppO2 = rhoO2/WO2_*RR*Tc;
 
     // Intrinsic reactivity [1/s]
-    const scalar ki = Ai_*exp(-Ei_/specie::RR/T);
+    const scalar ki = Ai_*exp(-Ei_/RR/T);
 
     // Thiele modulus []
     const scalar phi =
@@ -195,7 +195,7 @@ Foam::scalar Foam::COxidationIntrinsicRate<CloudType>::calculate
     const scalar Ap = constant::mathematical::pi*sqr(d);
 
     // Change in C mass [kg]
-    scalar dmC = Ap*rhoc*specie::RR*Tc*YO2/WO2_*D0*R/(D0 + R)*dt;
+    scalar dmC = Ap*rhoc*RR*Tc*YO2/WO2_*D0*R/(D0 + R)*dt;
 
     // Limit mass transfer by availability of C
     dmC = min(mass*Ychar, dmC);
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index 552a6caab..e99b06152 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,13 +137,13 @@ Foam::scalar Foam::COxidationKineticDiffusionLimitedRate<CloudType>::calculate
     const scalar D0 = C1_/d*pow(0.5*(T + Tc), 0.75);
 
     // Kinetic rate
-    const scalar Rk = C2_*exp(-E_/(specie::RR*Tc));
+    const scalar Rk = C2_*exp(-E_/(RR*Tc));
 
     // Particle surface area
     const scalar Ap = constant::mathematical::pi*sqr(d);
 
     // Change in C mass [kg]
-    scalar dmC = Ap*rhoc*specie::RR*Tc*YO2/WO2_*D0*Rk/(D0 + Rk)*dt;
+    scalar dmC = Ap*rhoc*RR*Tc*YO2/WO2_*D0*Rk/(D0 + Rk)*dt;
 
     // Limit mass transfer by availability of C
     dmC = min(mass*fComb, dmC);
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index 24bdf4927..151ad7037 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,10 +160,10 @@ Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::calculate
     const scalar D = D0_*(rho0_/rhoc)*pow(Tc/T0_, Dn_);
 
     // Far field partial pressure O2 [Pa]
-    const scalar ppO2 = rhoO2/WO2_*specie::RR*Tc;
+    const scalar ppO2 = rhoO2/WO2_*RR*Tc;
 
     // Total molar concentration of the carrier phase [kmol/m^3]
-    const scalar C = pc/(specie::RR*Tc);
+    const scalar C = pc/(RR*Tc);
 
     if (debug)
     {
@@ -191,7 +191,7 @@ Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::calculate
     {
         qCsOld = qCs;
         const scalar PO2Surface = ppO2*exp(-(qCs + N)*d/(2*C*D));
-        qCs = A_*exp(-E_/(specie::RR*T))*pow(PO2Surface, n_);
+        qCs = A_*exp(-E_/(RR*T))*pow(PO2Surface, n_);
         qCs = (100.0*qCs + iter*qCsOld)/(100.0 + iter);
         qCs = min(qCs, qCsLim);
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 847964c3e..5ffc645e8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -557,7 +557,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     {
         // Molar average molecular weight of carrier mix
         const scalar Wc =
-            max(SMALL, this->rhoc_*specie::RR*this->Tc_/this->pc_);
+            max(SMALL, this->rhoc_*RR*this->Tc_/this->pc_);
 
         // Note: hardcoded gaseous diffusivities for now
         // TODO: add to carrier thermo
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index d8f37f8a9..6d8dc12b2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
     if (td.cloud().heatTransfer().BirdCorrection())
     {
         // Average molecular weight of carrier mix - assumes perfect gas
-        const scalar Wc = this->rhoc_*specie::RR*this->Tc_/this->pc_;
+        const scalar Wc = this->rhoc_*RR*this->Tc_/this->pc_;
 
         forAll(dMassPC, i)
         {
@@ -341,10 +341,10 @@ void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
     Xinf /= sum(Xinf);
 
     // Molar fraction of far field species at particle surface
-    const scalar Xsff = 1.0 - min(sum(Cs)*specie::RR*this->T_/pc_, 1.0);
+    const scalar Xsff = 1.0 - min(sum(Cs)*RR*this->T_/pc_, 1.0);
 
     // Surface carrier total molar concentration
-    const scalar CsTot = pc_/(specie::RR*this->T_);
+    const scalar CsTot = pc_/(RR*this->T_);
 
     // Surface carrier composition (molar fraction)
     scalarField Xs(Xinf.size());
@@ -388,7 +388,7 @@ void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
 
     Cps = max(Cps, ROOTVSMALL);
 
-    rhos *= pc_/(specie::RR*T);
+    rhos *= pc_/(RR*T);
     rhos = max(rhos, ROOTVSMALL);
 
     mus /= sumYiSqrtW;
@@ -621,4 +621,3 @@ void Foam::ReactingParcel<ParcelType>::calc
 #include "ReactingParcelIO.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index b387a99ea..221c687a6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,10 +219,10 @@ void Foam::LiquidEvaporation<CloudType>::calculate
         const scalar kc = Sh*Dab/(d + ROOTVSMALL);
 
         // vapour concentration at surface [kmol/m3] at film temperature
-        const scalar Cs = pSat/(specie::RR*Ts);
+        const scalar Cs = pSat/(RR*Ts);
 
         // vapour concentration in bulk gas [kmol/m3] at film temperature
-        const scalar Cinf = Xc[gid]*pc/(specie::RR*Ts);
+        const scalar Cinf = Xc[gid]*pc/(RR*Ts);
 
         // molar flux of vapour [kmol/m2/s]
         const scalar Ni = max(kc*(Cs - Cinf), 0.0);
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
index adde0740a..c655faa36 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -193,7 +193,7 @@ void Foam::LiquidEvaporationBoil<CloudType>::calculate
     scalar ps = liquids_.pv(pc, Ts, X);
 
     // vapour density at droplet surface [kg/m3]
-    scalar rhos = ps*liquids_.W(X)/(specie::RR*Ts);
+    scalar rhos = ps*liquids_.W(X)/(RR*Ts);
 
     // construct carrier phase species volume fractions for cell, cellI
     const scalarField XcMix(calcXc(cellI));
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index d3a8ca8ae..935b35718 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ void Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
         const scalar E = volatileData_[i].E();
 
         // Kinetic rate
-        const scalar kappa = A1*exp(-E/(specie::RR*T));
+        const scalar kappa = A1*exp(-E/(RR*T));
 
         // Mass transferred from particle to carrier gas phase
         dMassDV[id] = min(dt*kappa*massVolatile, massVolatile);
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 0238727cc..76e4aeb7d 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -14,7 +14,9 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -37,10 +39,9 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
index 0b1419c5a..f9702b6d1 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,8 +164,8 @@ void Foam::SprayParcel<ParcelType>::calcAtomization
         td.cloud().atomization();
 
     // Average molecular weight of carrier mix - assumes perfect gas
-    scalar Wc = this->rhoc_*specie::RR*this->Tc()/this->pc();
-    scalar R = specie::RR/Wc;
+    scalar Wc = this->rhoc_*RR*this->Tc()/this->pc();
+    scalar R = RR/Wc;
     scalar Tav = atomization.Taverage(this->T(), this->Tc());
 
     // Calculate average gas density based on average temperature
@@ -235,8 +235,8 @@ void Foam::SprayParcel<ParcelType>::calcBreakup
     }
 
     // Average molecular weight of carrier mix - assumes perfect gas
-    scalar Wc = this->rhoc()*specie::RR*this->Tc()/this->pc();
-    scalar R = specie::RR/Wc;
+    scalar Wc = this->rhoc()*RR*this->Tc()/this->pc();
+    scalar R = RR/Wc;
     scalar Tav = td.cloud().atomization().Taverage(this->T(), this->Tc());
 
     // Calculate average gas density based on average temperature
diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options
index 7b96cb008..811fe0951 100644
--- a/src/lagrangian/turbulence/Make/options
+++ b/src/lagrangian/turbulence/Make/options
@@ -12,8 +12,10 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -35,16 +37,11 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
     -ldynamicFvMesh \
     -lsampling
-
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index b01d3b49c..cb314e5af 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,8 @@ License
 
 #include "DispersionRASModel.H"
 #include "demandDrivenData.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
@@ -35,7 +35,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::DispersionRASModel<CloudType>::kModel() const
 {
     const objectRegistry& obr = this->owner().mesh();
-    const word turbName = "turbulenceModel";
+    const word turbName = turbulenceModel::propertiesName;
 
     if (obr.foundObject<compressible::turbulenceModel>(turbName))
     {
@@ -70,7 +70,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::DispersionRASModel<CloudType>::epsilonModel() const
 {
     const objectRegistry& obr = this->owner().mesh();
-    const word turbName = "turbulenceModel";
+    const word turbName = turbulenceModel::propertiesName;
 
     if (obr.foundObject<compressible::turbulenceModel>(turbName))
     {
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 58ffe6b46..026413461 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,8 +26,8 @@ License
 #include "BrownianMotionForce.H"
 #include "mathematicalConstants.H"
 #include "demandDrivenData.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 
 using namespace Foam::constant;
 
@@ -57,7 +57,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::BrownianMotionForce<CloudType>::kModel() const
 {
     const objectRegistry& obr = this->owner().mesh();
-    const word turbName = "turbulenceModel";
+    const word turbName = turbulenceModel::propertiesName;
 
     if (obr.foundObject<compressible::turbulenceModel>(turbName))
     {
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 79e3796ba..4618b228d 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 }
 
 
-Foam::fileName Foam::topoSet::topoSet::localPath
+Foam::fileName Foam::topoSet::localPath
 (
     const polyMesh& mesh,
     const word& name
@@ -143,7 +143,7 @@ Foam::fileName Foam::topoSet::topoSet::localPath
 
 // Update stored cell numbers using map.
 // Do in two passes to prevent allocation if nothing changed.
-void Foam::topoSet::topoSet::updateLabels(const labelList& map)
+void Foam::topoSet::updateLabels(const labelList& map)
 {
     // Iterate over map to see if anything changed
     bool changed = false;
@@ -191,7 +191,7 @@ void Foam::topoSet::topoSet::updateLabels(const labelList& map)
 }
 
 
-void Foam::topoSet::topoSet::check(const label maxLabel)
+void Foam::topoSet::check(const label maxLabel)
 {
     forAllConstIter(topoSet, *this, iter)
     {
diff --git a/src/postProcessing/functionObjects/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options
index 5952c6b6c..3dd0b1248 100644
--- a/src/postProcessing/functionObjects/forces/Make/options
+++ b/src/postProcessing/functionObjects/forces/Make/options
@@ -3,18 +3,18 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
     -lfiniteVolume \
     -lmeshTools \
     -lfileFormats
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 539e14b30..fa8cfdcfc 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,10 +30,8 @@ License
 #include "wordReList.H"
 #include "fvcGrad.H"
 #include "porosityModel.H"
-#include "fluidThermo.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "incompressible/transportModel/transportModel.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -209,17 +207,17 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
     typedef compressible::turbulenceModel cmpTurbModel;
     typedef incompressible::turbulenceModel icoTurbModel;
 
-    if (obr_.foundObject<cmpTurbModel>(cmpTurbModel::typeName))
+    if (obr_.foundObject<cmpTurbModel>(cmpTurbModel::propertiesName))
     {
         const cmpTurbModel& turb =
-            obr_.lookupObject<cmpTurbModel>(cmpTurbModel::typeName);
+            obr_.lookupObject<cmpTurbModel>(cmpTurbModel::propertiesName);
 
         return turb.devRhoReff();
     }
-    else if (obr_.foundObject<icoTurbModel>(icoTurbModel::typeName))
+    else if (obr_.foundObject<icoTurbModel>(icoTurbModel::propertiesName))
     {
         const incompressible::turbulenceModel& turb =
-            obr_.lookupObject<icoTurbModel>(icoTurbModel::typeName);
+            obr_.lookupObject<icoTurbModel>(icoTurbModel::propertiesName);
 
         return rho()*turb.devReff();
     }
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
index c642e5e69..23063d154 100644
--- a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,10 +153,10 @@ void Foam::DESModelRegions::execute()
 
 
         label DESpresent = false;
-        if (mesh.foundObject<icoModel>("turbulenceModel"))
+        if (mesh.foundObject<icoModel>(turbulenceModel::propertiesName))
         {
             const icoModel& model =
-                mesh.lookupObject<icoModel>("turbulenceModel");
+                mesh.lookupObject<icoModel>(turbulenceModel::propertiesName);
 
             if (isA<icoDESModel>(model))
             {
@@ -166,10 +166,10 @@ void Foam::DESModelRegions::execute()
                 DESpresent = true;
             }
         }
-        else if (mesh.foundObject<cmpModel>("turbulenceModel"))
+        else if (mesh.foundObject<cmpModel>(turbulenceModel::propertiesName))
         {
             const cmpModel& model =
-                mesh.lookupObject<cmpModel>("turbulenceModel");
+                mesh.lookupObject<cmpModel>(turbulenceModel::propertiesName);
 
             if (isA<cmpDESModel>(model))
             {
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 0b5490616..3f2c2ebad 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -5,43 +5,48 @@ CourantNo/CourantNoFunctionObject.C
 
 Lambda2/Lambda2.C
 Lambda2/Lambda2FunctionObject.C
-
+/*
 Peclet/Peclet.C
 Peclet/PecletFunctionObject.C
-
+*/
 Q/Q.C
 Q/QFunctionObject.C
 
 blendingFactor/blendingFactor.C
 blendingFactor/blendingFactorFunctionObject.C
-
+/*
 DESModelRegions/DESModelRegions.C
 DESModelRegions/DESModelRegionsFunctionObject.C
-
+*/
 dsmcFields/dsmcFields.C
 dsmcFields/dsmcFieldsFunctionObject.C
 
 pressureTools/pressureTools.C
 pressureTools/pressureToolsFunctionObject.C
 
+/*
 scalarTransport/scalarTransport.C
 scalarTransport/scalarTransportFunctionObject.C
+*/
 
 timeActivatedFileUpdate/timeActivatedFileUpdate.C
 timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C
 
+/*
 turbulenceFields/turbulenceFields.C
 turbulenceFields/turbulenceFieldsFunctionObject.C
+*/
 
 vorticity/vorticity.C
 vorticity/vorticityFunctionObject.C
-
+/*
 wallShearStress/wallShearStress.C
 wallShearStress/wallShearStressFunctionObject.C
-
+*/
+/*
 yPlusLES/yPlusLES.C
 yPlusLES/yPlusLESFunctionObject.C
-
+*/
 yPlusRAS/yPlusRAS.C
 yPlusRAS/yPlusRASFunctionObject.C
 
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index a561f6ca1..d7868cbb8 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -5,12 +5,8 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -20,8 +16,5 @@ LIB_LIBS = \
     -llagrangian \
     -ldsmc \
     -lincompressibleTransportModels \
-    -lcompressibleRASModels \
-    -lincompressibleRASModels \
-    -lcompressibleLESModels \
-    -lincompressibleLESModels \
+    -lturbulenceModels \
     -lfluidThermophysicalModels
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
index 6d288fcfc..a0683b4a1 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,20 +128,29 @@ void Foam::Peclet::execute()
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         tmp<volScalarField> nuEff;
-        if (mesh.foundObject<cmpTurbModel>("turbulenceModel"))
+        if (mesh.foundObject<cmpTurbModel>(turbulenceModel::propertiesName))
         {
             const cmpTurbModel& model =
-                mesh.lookupObject<cmpTurbModel>("turbulenceModel");
+                mesh.lookupObject<cmpTurbModel>
+                (
+                    turbulenceModel::propertiesName
+                );
 
             const volScalarField& rho =
                 mesh.lookupObject<volScalarField>(rhoName_);
 
             nuEff = model.muEff()/rho;
         }
-        else if (mesh.foundObject<icoTurbModel>("turbulenceModel"))
+        else if
+        (
+            mesh.foundObject<icoTurbModel>(turbulenceModel::propertiesName)
+        )
         {
             const icoTurbModel& model =
-                mesh.lookupObject<icoTurbModel>("turbulenceModel");
+                mesh.lookupObject<icoTurbModel>
+                (
+                    turbulenceModel::propertiesName
+                );
 
             nuEff = model.nuEff();
         }
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index 442838860..d65dc92fb 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,15 +97,21 @@ Foam::tmp<Foam::volScalarField> Foam::scalarTransport::DT
             )
         );
     }
-    else if (mesh_.foundObject<icoModel>("turbulenceModel"))
+    else if (mesh_.foundObject<icoModel>(turbulenceModel::propertiesName))
     {
-        const icoModel& model = mesh_.lookupObject<icoModel>("turbulenceModel");
+        const icoModel& model = mesh_.lookupObject<icoModel>
+        (
+            turbulenceModel::propertiesName
+        );
 
         return model.nuEff();
     }
-    else if (mesh_.foundObject<cmpModel>("turbulenceModel"))
+    else if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
     {
-        const cmpModel& model = mesh_.lookupObject<cmpModel>("turbulenceModel");
+        const cmpModel& model = mesh_.lookupObject<cmpModel>
+        (
+            turbulenceModel::propertiesName
+        );
 
         return model.muEff();
     }
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
index 3d89600cf..3fbbb8fb0 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ namespace Foam
     const NamedEnum<turbulenceFields::incompressibleField, 4>
         turbulenceFields::incompressibleFieldNames_;
 
-    const word turbulenceFields::modelName = "turbulenceModel";
+    const word turbulenceFields::modelName = turbulenceModel::propertiesName;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index 00647d149..393d890d2 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -242,17 +242,17 @@ void Foam::wallShearStress::execute()
 
 
         tmp<volSymmTensorField> Reff;
-        if (mesh.foundObject<cmpModel>("turbulenceModel"))
+        if (mesh.foundObject<cmpModel>(turbulenceModel::propertiesName))
         {
             const cmpModel& model =
-                mesh.lookupObject<cmpModel>("turbulenceModel");
+                mesh.lookupObject<cmpModel>(turbulenceModel::propertiesName);
 
             Reff = model.devRhoReff();
         }
-        else if (mesh.foundObject<icoModel>("turbulenceModel"))
+        else if (mesh.foundObject<icoModel>(turbulenceModel::propertiesName))
         {
             const icoModel& model =
-                mesh.lookupObject<icoModel>("turbulenceModel");
+                mesh.lookupObject<icoModel>(turbulenceModel::propertiesName);
 
             Reff = model.devReff();
         }
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
index 68125069a..12c8349a3 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,12 +25,8 @@ License
 
 #include "yPlusRAS.H"
 #include "volFields.H"
-
-#include "incompressible/RAS/RASModel/RASModel.H"
-#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
-#include "compressible/RAS/RASModel/RASModel.H"
-#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H"
-#include "wallDist.H"
+#include "turbulenceModel.H"
+#include "nutWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -55,17 +51,16 @@ void Foam::yPlusRAS::writeFileHeader(const label i)
 }
 
 
-void Foam::yPlusRAS::calcIncompressibleYPlus
+void Foam::yPlusRAS::calcYPlus
 (
     const fvMesh& mesh,
     volScalarField& yPlus
 )
 {
-    typedef incompressible::nutWallFunctionFvPatchScalarField
-        wallFunctionPatchField;
-
-    const incompressible::RASModel& model =
-        mesh.lookupObject<incompressible::RASModel>("RASProperties");
+    const turbulenceModel& model = mesh.lookupObject<turbulenceModel>
+    (
+        turbulenceModel::propertiesName
+    );
 
     const volScalarField nut(model.nut());
     const volScalarField::GeometricBoundaryField& nutPatches =
@@ -74,12 +69,15 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
     bool foundPatch = false;
     forAll(nutPatches, patchi)
     {
-        if (isA<wallFunctionPatchField>(nutPatches[patchi]))
+        if (isA<nutWallFunctionFvPatchScalarField>(nutPatches[patchi]))
         {
             foundPatch = true;
 
-            const wallFunctionPatchField& nutPw =
-                dynamic_cast<const wallFunctionPatchField&>(nutPatches[patchi]);
+            const nutWallFunctionFvPatchScalarField& nutPw =
+                dynamic_cast
+                <
+                    const nutWallFunctionFvPatchScalarField&
+                >(nutPatches[patchi]);
 
             yPlus.boundaryField()[patchi] = nutPw.yPlus();
             const scalarField& Yp = yPlus.boundaryField()[patchi];
@@ -106,65 +104,8 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
 
     if (log_ && !foundPatch)
     {
-        Info<< "    no " << wallFunctionPatchField::typeName << " patches"
-            << endl;
-    }
-}
-
-
-void Foam::yPlusRAS::calcCompressibleYPlus
-(
-    const fvMesh& mesh,
-    volScalarField& yPlus
-)
-{
-    typedef compressible::mutWallFunctionFvPatchScalarField
-        wallFunctionPatchField;
-
-    const compressible::RASModel& model =
-        mesh.lookupObject<compressible::RASModel>("RASProperties");
-
-    const volScalarField mut(model.mut());
-    const volScalarField::GeometricBoundaryField& mutPatches =
-        mut.boundaryField();
-
-    bool foundPatch = false;
-    forAll(mutPatches, patchi)
-    {
-        if (isA<wallFunctionPatchField>(mutPatches[patchi]))
-        {
-            foundPatch = true;
-
-            const wallFunctionPatchField& mutPw =
-                dynamic_cast<const wallFunctionPatchField&>(mutPatches[patchi]);
-
-            yPlus.boundaryField()[patchi] = mutPw.yPlus();
-            const scalarField& Yp = yPlus.boundaryField()[patchi];
-
-            scalar minYp = gMin(Yp);
-            scalar maxYp = gMax(Yp);
-            scalar avgYp = gAverage(Yp);
-
-            if (Pstream::master())
-            {
-                Info(log_)<< "    patch " << mutPw.patch().name()
-                    << " y+ : min = " << minYp << ", max = " << maxYp
-                    << ", average = " << avgYp << nl;
-
-                file() << obr_.time().value()
-                    << token::TAB << mutPw.patch().name()
-                    << token::TAB << minYp
-                    << token::TAB << maxYp
-                    << token::TAB << avgYp
-                    << endl;
-            }
-        }
-    }
-
-    if (log_ && !foundPatch)
-    {
-        Info<< "    no " << wallFunctionPatchField::typeName << " patches"
-            << endl;
+        Info<< "    no " << nutWallFunctionFvPatchScalarField::typeName
+            << " patches" << endl;
     }
 }
 
@@ -253,9 +194,6 @@ void Foam::yPlusRAS::execute()
     {
         functionObjectFile::write();
 
-        const surfaceScalarField& phi =
-            obr_.lookupObject<surfaceScalarField>(phiName_);
-
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         volScalarField& yPlusRAS =
@@ -266,14 +204,7 @@ void Foam::yPlusRAS::execute()
 
         Info(log_)<< type() << " " << name_ << " output:" << nl;
 
-        if (phi.dimensions() == dimMass/dimTime)
-        {
-            calcCompressibleYPlus(mesh, yPlusRAS);
-        }
-        else
-        {
-            calcIncompressibleYPlus(mesh, yPlusRAS);
-        }
+        calcYPlus(mesh, yPlusRAS);
     }
 }
 
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
index 8a73cd47d..7c3cdd696 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,11 +87,8 @@ class yPlusRAS
         //- File header information
         virtual void writeFileHeader(const label i);
 
-        //- Calculate incompressible form of y+
-        void calcIncompressibleYPlus(const fvMesh& mesh, volScalarField& yPlus);
-
-        //- Calculate compressible form of y+
-        void calcCompressibleYPlus(const fvMesh& mesh, volScalarField& yPlus);
+        //- Calculate y+
+        void calcYPlus(const fvMesh& mesh, volScalarField& yPlus);
 
         //- Disallow default bitwise copy construct
         yPlusRAS(const yPlusRAS&);
diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options
index ea55cd87d..e877774c1 100644
--- a/src/regionCoupled/Make/options
+++ b/src/regionCoupled/Make/options
@@ -1,11 +1,13 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lfiniteVolume \
     -lmeshTools \
-    -lcompressibleTurbulenceModel
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 9f0fe9a60..fd01b6497 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "energyRegionCoupledFvPatchScalarField.H"
 #include "Time.H"
-#include "turbulenceModel.H"
+#include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
@@ -63,7 +63,7 @@ void Foam::energyRegionCoupledFvPatchScalarField::setMethod() const
         (
             this->db().foundObject<compressible::turbulenceModel>
             (
-                "turbulenceModel"
+                turbulenceModel::propertiesName
             )
         )
         {
@@ -109,7 +109,7 @@ kappa() const
             const compressible::turbulenceModel& turbModel =
                 this->db().lookupObject<compressible::turbulenceModel>
                 (
-                    "turbulenceModel"
+                    turbulenceModel::propertiesName
                 );
 
             return turbModel.kappaEff(patch().index());
diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options
index 7f59d7524..75d130d34 100644
--- a/src/regionModels/pyrolysisModels/Make/options
+++ b/src/regionModels/pyrolysisModels/Make/options
@@ -8,11 +8,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 LIB_LIBS = \
@@ -23,10 +20,8 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidChemistryModel \
     -lsolidThermo \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lregionModels \
     -lradiationModels \
     -lreactionThermophysicalModels
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index a346c249b..ce9120095 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -16,11 +16,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -34,5 +31,5 @@ LIB_LIBS = \
     -lSLGThermo \
     -lfiniteVolume \
     -lmeshTools \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files
index 6f150005f..01e50d24a 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files
@@ -1,5 +1,4 @@
 alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
-mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
-
+nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libsurfaceFilmDerivedFvPatchFields
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
index e894e6d69..ca490a074 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
@@ -9,10 +9,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
 
@@ -27,8 +25,7 @@ LIB_LIBS = \
     -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lregionModels \
     -lsurfaceFilmModels
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index fb2d12349..e6eb83bc9 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "alphatFilmWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "surfaceFilmModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -150,27 +150,36 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
     // Retrieve phase change mass from surface film model
     const modelType& filmModel =
         db().time().lookupObject<modelType>("surfaceFilmProperties");
 
-    const label filmPatchI = filmModel.regionPatchID(patchI);
+    const label filmPatchI = filmModel.regionPatchID(patchi);
 
     tmp<volScalarField> mDotFilm(filmModel.primaryMassTrans());
     scalarField mDotFilmp = mDotFilm().boundaryField()[filmPatchI];
     filmModel.toPrimary(filmPatchI, mDotFilmp);
 
     // Retrieve RAS turbulence model
-    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
 
-    const scalarField& y = rasModel.y()[patchI];
-    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
-    const tmp<volScalarField> tk = rasModel.k();
+    const scalarField& y = turbModel.y()[patchi];
+    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
+    const tmp<volScalarField> tk = turbModel.k();
     const volScalarField& k = tk();
-    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
-    const scalarField& alphaw = rasModel.alpha().boundaryField()[patchI];
+    const tmp<scalarField> tmuw = turbModel.mu(patchi);
+    const scalarField& muw = tmuw();
+    const tmp<scalarField> talpha = turbModel.alpha(patchi);
+    const scalarField& alphaw = talpha();
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
similarity index 62%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
rename to src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index ee912e618..2b6727b91 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutkFilmWallFunctionFvPatchScalarField.H"
+#include "nutkFilmWallFunctionFvPatchScalarField.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
-#include "RASModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "addToRunTimeSelectionTable.H"
 #include "surfaceFilmModel.H"
 #include "mappedWallPolyPatch.H"
@@ -43,7 +43,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
+tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcUTau
 (
     const scalarField& magGradU
 ) const
@@ -62,13 +62,13 @@ tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
         return tuTau;
     }
 
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
     // Retrieve phase change mass from surface film model
     const modelType& filmModel =
         db().time().lookupObject<modelType>("surfaceFilmProperties");
 
-    const label filmPatchI = filmModel.regionPatchID(patchI);
+    const label filmPatchI = filmModel.regionPatchID(patchi);
 
     tmp<volScalarField> mDotFilm(filmModel.primaryMassTrans());
     scalarField mDotFilmp = mDotFilm().boundaryField()[filmPatchI];
@@ -76,12 +76,20 @@ tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
 
 
     // Retrieve RAS turbulence model
-    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-    const scalarField& y = rasModel.y()[patchI];
-    const fvPatchScalarField& rhow = rasModel.rho().boundaryField()[patchI];
-    const fvPatchScalarField& muw = rasModel.mu().boundaryField()[patchI];
-    const tmp<volScalarField> tk = rasModel.k();
+    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
+
+    const scalarField& y = turbModel.y()[patchi];
+    const tmp<volScalarField> tk = turbModel.k();
     const volScalarField& k = tk();
+    const tmp<scalarField> tnuw = turbModel.nu(patchi);
+    const scalarField& nuw = tnuw();
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
 
@@ -91,7 +99,7 @@ tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
 
         scalar ut = Cmu25*sqrt(k[faceCellI]);
 
-        scalar yPlus = y[faceI]*ut/(muw[faceI]/rhow[faceI]);
+        scalar yPlus = y[faceI]*ut/nuw[faceI];
 
         scalar mStar = mDotFilmp[faceI]/(y[faceI]*ut);
 
@@ -115,83 +123,91 @@ tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
 }
 
 
-tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcMut() const
+tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcNut() const
 {
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
-    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
+
+    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
     const scalarField magGradU(mag(Uw.snGrad()));
-    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
-    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+    const tmp<scalarField> tnuw = turbModel.nu(patchi);
+    const scalarField& nuw = tnuw();
 
     return max
     (
         scalar(0),
-        rhow*sqr(calcUTau(magGradU))/(magGradU + ROOTVSMALL) - muw
+        sqr(calcUTau(magGradU))/(magGradU + ROOTVSMALL) - nuw
     );
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mutkFilmWallFunctionFvPatchScalarField::mutkFilmWallFunctionFvPatchScalarField
+nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutkWallFunctionFvPatchScalarField(p, iF),
+    nutkWallFunctionFvPatchScalarField(p, iF),
     B_(5.5),
     yPlusCrit_(11.05)
 {}
 
 
-mutkFilmWallFunctionFvPatchScalarField::mutkFilmWallFunctionFvPatchScalarField
+nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField
 (
-    const mutkFilmWallFunctionFvPatchScalarField& ptf,
+    const nutkFilmWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
     B_(5.5),
     yPlusCrit_(11.05)
 {}
 
 
-mutkFilmWallFunctionFvPatchScalarField::mutkFilmWallFunctionFvPatchScalarField
+nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    mutkWallFunctionFvPatchScalarField(p, iF, dict),
+    nutkWallFunctionFvPatchScalarField(p, iF, dict),
     B_(dict.lookupOrDefault("B", 5.5)),
     yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05))
 {}
 
 
-mutkFilmWallFunctionFvPatchScalarField::mutkFilmWallFunctionFvPatchScalarField
+nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField
 (
-    const mutkFilmWallFunctionFvPatchScalarField& wfpsf
+    const nutkFilmWallFunctionFvPatchScalarField& wfpsf
 )
 :
-    mutkWallFunctionFvPatchScalarField(wfpsf),
+    nutkWallFunctionFvPatchScalarField(wfpsf),
     B_(wfpsf.B_),
     yPlusCrit_(wfpsf.yPlusCrit_)
 {}
 
 
-mutkFilmWallFunctionFvPatchScalarField::mutkFilmWallFunctionFvPatchScalarField
+nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField
 (
-    const mutkFilmWallFunctionFvPatchScalarField& wfpsf,
+    const nutkFilmWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutkWallFunctionFvPatchScalarField(wfpsf, iF),
+    nutkWallFunctionFvPatchScalarField(wfpsf, iF),
     B_(wfpsf.B_),
     yPlusCrit_(wfpsf.yPlusCrit_)
 {}
@@ -199,21 +215,29 @@ mutkFilmWallFunctionFvPatchScalarField::mutkFilmWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::yPlus() const
 {
-    const label patchI = patch().index();
+    const label patchi = patch().index();
 
-    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-    const scalarField& y = rasModel.y()[patchI];
-    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
-    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
-    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
+    (
+        IOobject::groupName
+        (
+            turbulenceModel::propertiesName,
+            dimensionedInternalField().group()
+        )
+    );
 
-    return y*calcUTau(mag(Uw.snGrad()))/(muw/rhow);
+    const scalarField& y = turbModel.y()[patchi];
+    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
+    const tmp<scalarField> tnuw = turbModel.nu(patchi);
+    const scalarField& nuw = tnuw();
+
+    return y*calcUTau(mag(Uw.snGrad()))/nuw;
 }
 
 
-void mutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
+void nutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -225,7 +249,7 @@ void mutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, mutkFilmWallFunctionFvPatchScalarField);
+makePatchTypeField(fvPatchScalarField, nutkFilmWallFunctionFvPatchScalarField);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
similarity index 76%
rename from src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.H
rename to src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
index 7e7a2a99f..9eb4c5e19 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::RASModels::mutkFilmWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::nutkFilmWallFunctionFvPatchScalarField
 
 Group
     grpSurfaceFilmBoundaryConditions grpCmpWallFunctions
@@ -38,23 +38,23 @@ Description
     \verbatim
     myPatch
     {
-        type            mutkFilmWallFunction;
+        type            nutkFilmWallFunction;
         value           uniform 0;
     }
     \endverbatim
 
 SeeAlso
-    Foam::mutkWallFunctionFvPatchScalarField
+    Foam::nutkWallFunctionFvPatchScalarField
 
 SourceFiles
-    mutkFilmWallFunctionFvPatchScalarField.C
+    nutkFilmWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H
-#define compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H
+#ifndef compressibleNutSpalartAllmarasWallFunctionFvPatchScalarField_H
+#define compressibleNutSpalartAllmarasWallFunctionFvPatchScalarField_H
 
-#include "mutkWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,12 +66,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-         Class mutkFilmWallFunctionFvPatchScalarField Declaration
+         Class nutkFilmWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutkFilmWallFunctionFvPatchScalarField
+class nutkFilmWallFunctionFvPatchScalarField
 :
-    public mutkWallFunctionFvPatchScalarField
+    public nutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -87,7 +87,7 @@ protected:
     // Protected member functions
 
         //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
+        virtual tmp<scalarField> calcNut() const;
 
         //- Calculate the friction velocity
         virtual tmp<scalarField> calcUTau(const scalarField& magGradU) const;
@@ -96,20 +96,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("mutkFilmWallFunction");
+    TypeName("nutkFilmWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutkFilmWallFunctionFvPatchScalarField
+        nutkFilmWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutkFilmWallFunctionFvPatchScalarField
+        nutkFilmWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -117,20 +117,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  mutkFilmWallFunctionFvPatchScalarField
+        //  nutkFilmWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutkFilmWallFunctionFvPatchScalarField
+        nutkFilmWallFunctionFvPatchScalarField
         (
-            const mutkFilmWallFunctionFvPatchScalarField&,
+            const nutkFilmWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutkFilmWallFunctionFvPatchScalarField
+        nutkFilmWallFunctionFvPatchScalarField
         (
-            const mutkFilmWallFunctionFvPatchScalarField&
+            const nutkFilmWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -138,14 +138,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutkFilmWallFunctionFvPatchScalarField(*this)
+                new nutkFilmWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutkFilmWallFunctionFvPatchScalarField
+        nutkFilmWallFunctionFvPatchScalarField
         (
-            const mutkFilmWallFunctionFvPatchScalarField&,
+            const nutkFilmWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -157,7 +157,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutkFilmWallFunctionFvPatchScalarField(*this, iF)
+                new nutkFilmWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options
index 7e6997476..bc36cf7dc 100644
--- a/src/regionModels/thermalBaffleModels/Make/options
+++ b/src/regionModels/thermalBaffleModels/Make/options
@@ -7,16 +7,16 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 LIB_LIBS = \
     -lregionModels \
     -lsolidThermo \
-    -lcompressibleTurbulenceModel \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
     -lmeshTools \
-    -lOpenFOAM \
     -lradiationModels \
     -ldynamicMesh
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
index 5fec22dc9..2c3403ed2 100644
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
index dda7e9428..3910a4f37 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
index baf20aeba..a36766ade 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index e84b5a226..fa1505700 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index a97eb1b4f..e03bbb797 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H
index ffe602dc4..ea76fb242 100644
--- a/src/thermophysicalModels/specie/specie/specie.H
+++ b/src/thermophysicalModels/specie/specie/specie.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermoI.H b/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermoI.H
index 33e3b31c8..b46543a40 100644
--- a/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hExponential/hExponentialThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index bda645c0f..511e871bf 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index f639ffce9..c92082dae 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index 3136307fe..b8e73cf2c 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index 070683638..d897968d1 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/Allwmake b/src/turbulenceModels/Allwmake
deleted file mode 100755
index 3a95797ba..000000000
--- a/src/turbulenceModels/Allwmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-targetType=libso
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
-
-LES/Allwmake $targetType $*
-incompressible/Allwmake $targetType $*
-compressible/Allwmake $targetType $*
-wmake $targetType derivedFvPatchFields
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake
deleted file mode 100755
index a209819d1..000000000
--- a/src/turbulenceModels/LES/Allwmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-targetType=libso
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
-
-wmakeLnInclude ../incompressible/LES
-
-wmake $targetType LESfilters
-wmake $targetType LESdeltas
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
deleted file mode 100644
index 5a8ff1c3f..000000000
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ /dev/null
@@ -1,138 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LESdelta.H"
-#include "calculatedFvPatchFields.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(LESdelta, 0);
-    defineRunTimeSelectionTable(LESdelta, dictionary);
-}
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::LESdelta::LESdelta(const word& name, const fvMesh& mesh)
-:
-    mesh_(mesh),
-    delta_
-    (
-        IOobject
-        (
-            name,
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh,
-        dimensionedScalar(name, dimLength, SMALL),
-        calculatedFvPatchScalarField::typeName
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-{
-    const word deltaType(dict.lookup("delta"));
-
-    Info<< "Selecting LES delta type " << deltaType << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(deltaType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESdelta::New(const fvMesh&, const dictionary&)"
-        )   << "Unknown LESdelta type "
-            << deltaType << nl << nl
-            << "Valid LESdelta types are :" << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
-}
-
-
-Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dict,
-    const dictionaryConstructorTable& additionalConstructors
-)
-{
-    const word deltaType(dict.lookup("delta"));
-
-    Info<< "Selecting LES delta type " << deltaType << endl;
-
-    // First on additional ones
-    dictionaryConstructorTable::const_iterator cstrIter =
-        additionalConstructors.find(deltaType);
-
-    if (cstrIter != additionalConstructors.end())
-    {
-        return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
-    }
-    else
-    {
-        dictionaryConstructorTable::const_iterator cstrIter =
-            dictionaryConstructorTablePtr_->find(deltaType);
-
-        if (cstrIter == dictionaryConstructorTablePtr_->end())
-        {
-            FatalErrorIn
-            (
-                "LESdelta::New(const fvMesh&, const dictionary&)"
-            )   << "Unknown LESdelta type "
-                << deltaType << nl << nl
-                << "Valid LESdelta types are :" << endl
-                << additionalConstructors.sortedToc()
-                << " and "
-                << dictionaryConstructorTablePtr_->sortedToc()
-                << exit(FatalError);
-            return autoPtr<LESdelta>();
-        }
-        else
-        {
-            return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
deleted file mode 100644
index c84ae74c3..000000000
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
+++ /dev/null
@@ -1,160 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::LESdelta
-
-Description
-    Abstract base class for LES deltas
-
-SourceFiles
-    LESdelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LESdelta_H
-#define LESdelta_H
-
-#include "volFields.H"
-#include "typeInfo.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class fvMesh;
-
-/*---------------------------------------------------------------------------*\
-                          Class LESdelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class LESdelta
-{
-
-protected:
-
-    // Protected data
-
-        const fvMesh& mesh_;
-
-        volScalarField delta_;
-
-
-private:
-
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESdelta(const LESdelta&);
-        void operator=(const LESdelta&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LESdelta");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            LESdelta,
-            dictionary,
-            (
-                const word& name,
-                const fvMesh& mesh,
-                const dictionary& LESdeltaDict
-            ),
-            (name, mesh, LESdeltaDict)
-        );
-
-
-    // Constructors
-
-        //- Construct from name and mesh
-        LESdelta(const word& name, const fvMesh&);
-
-
-    // Selectors
-
-        //- Return a reference to the selected LES delta
-        static autoPtr<LESdelta> New
-        (
-            const word& name,
-            const fvMesh&,
-            const dictionary&
-        );
-
-        //- Return a reference to the selected LES delta
-        static autoPtr<LESdelta> New
-        (
-            const word& name,
-            const fvMesh&,
-            const dictionary&,
-            const dictionaryConstructorTable&
-        );
-
-
-    //- Destructor
-    virtual ~LESdelta()
-    {}
-
-
-    // Member Functions
-
-        //- Return mesh reference
-        const fvMesh& mesh() const
-        {
-            return mesh_;
-        }
-
-        //- Read the LESdelta dictionary
-        virtual void read(const dictionary&) = 0;
-
-        // Correct values
-        virtual void correct() = 0;
-
-
-    // Member Operators
-
-        virtual operator const volScalarField&() const
-        {
-            return delta_;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/Make/files b/src/turbulenceModels/LES/LESdeltas/Make/files
deleted file mode 100644
index b150cc499..000000000
--- a/src/turbulenceModels/LES/LESdeltas/Make/files
+++ /dev/null
@@ -1,7 +0,0 @@
-LESdelta/LESdelta.C
-cubeRootVolDelta/cubeRootVolDelta.C
-PrandtlDelta/PrandtlDelta.C
-smoothDelta/smoothDelta.C
-maxDeltaxyz/maxDeltaxyz.C
-
-LIB = $(FOAM_LIBBIN)/libLESdeltas
diff --git a/src/turbulenceModels/LES/LESdeltas/Make/options b/src/turbulenceModels/LES/LESdeltas/Make/options
deleted file mode 100644
index 6ef95061d..000000000
--- a/src/turbulenceModels/LES/LESdeltas/Make/options
+++ /dev/null
@@ -1,9 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/LESmodels/isoLESmodels/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
deleted file mode 100644
index a66e32fe5..000000000
--- a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
+++ /dev/null
@@ -1,102 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "PrandtlDelta.H"
-#include "wallDist.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(PrandtlDelta, 0);
-addToRunTimeSelectionTable(LESdelta, PrandtlDelta, dictionary);
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void PrandtlDelta::calcDelta()
-{
-    delta_ = min
-    (
-        static_cast<const volScalarField&>(geometricDelta_()),
-        (kappa_/Cdelta_)*wallDist::New(mesh_).y()
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-PrandtlDelta::PrandtlDelta
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
-)
-:
-    LESdelta(name, mesh),
-    geometricDelta_(LESdelta::New(name, mesh, dd.subDict(type() + "Coeffs"))),
-    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.41)),
-    Cdelta_
-    (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
-    )
-{
-    calcDelta();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void PrandtlDelta::read(const dictionary& d)
-{
-    const dictionary& dd(d.subDict(type() + "Coeffs"));
-
-    geometricDelta_().read(dd);
-    d.readIfPresent<scalar>("kappa", kappa_);
-    dd.readIfPresent<scalar>("Cdelta", Cdelta_);
-    calcDelta();
-}
-
-
-void PrandtlDelta::correct()
-{
-    geometricDelta_().correct();
-
-    if (mesh_.changing())
-    {
-        calcDelta();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
deleted file mode 100644
index d8840ff1a..000000000
--- a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
+++ /dev/null
@@ -1,110 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::PrandtlDelta
-
-Description
-    Simple cube-root of cell volume delta used in LES models.
-
-SourceFiles
-    PrandtlDelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef PrandtlDelta_H
-#define PrandtlDelta_H
-
-#include "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class PrandtlDelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class PrandtlDelta
-:
-    public LESdelta
-{
-    // Private data
-
-        autoPtr<LESdelta> geometricDelta_;
-        scalar kappa_;
-        scalar Cdelta_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        PrandtlDelta(const PrandtlDelta&);
-        void operator=(const PrandtlDelta&);
-
-        // Calculate the delta values
-        void calcDelta();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("Prandtl");
-
-
-    // Constructors
-
-        //- Construct from name, mesh and IOdictionary
-        PrandtlDelta
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dictionary&
-        );
-
-
-    //- Destructor
-    virtual ~PrandtlDelta()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESdelta dictionary
-        virtual void read(const dictionary&);
-
-        // Correct values
-        virtual void correct();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
deleted file mode 100644
index 0e5e2820d..000000000
--- a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
+++ /dev/null
@@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "cubeRootVolDelta.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(cubeRootVolDelta, 0);
-addToRunTimeSelectionTable(LESdelta, cubeRootVolDelta, dictionary);
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void cubeRootVolDelta::calcDelta()
-{
-    label nD = mesh().nGeometricD();
-
-    if (nD == 3)
-    {
-        delta_.internalField() = deltaCoeff_*pow(mesh().V(), 1.0/3.0);
-    }
-    else if (nD == 2)
-    {
-        WarningIn("cubeRootVolDelta::calcDelta()")
-            << "Case is 2D, LES is not strictly applicable\n"
-            << endl;
-
-        const Vector<label>& directions = mesh().geometricD();
-
-        scalar thickness = 0.0;
-        for (direction dir=0; dir<directions.nComponents; dir++)
-        {
-            if (directions[dir] == -1)
-            {
-                thickness = mesh().bounds().span()[dir];
-                break;
-            }
-        }
-
-        delta_.internalField() = deltaCoeff_*sqrt(mesh().V()/thickness);
-    }
-    else
-    {
-        FatalErrorIn("cubeRootVolDelta::calcDelta()")
-            << "Case is not 3D or 2D, LES is not applicable"
-            << exit(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-cubeRootVolDelta::cubeRootVolDelta
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
-)
-:
-    LESdelta(name, mesh),
-    deltaCoeff_(readScalar(dd.subDict(type() + "Coeffs").lookup("deltaCoeff")))
-{
-    calcDelta();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void cubeRootVolDelta::read(const dictionary& dd)
-{
-    dd.subDict(type() + "Coeffs").lookup("deltaCoeff") >> deltaCoeff_;
-    calcDelta();
-}
-
-
-void cubeRootVolDelta::correct()
-{
-    if (mesh_.changing())
-    {
-        calcDelta();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
deleted file mode 100644
index f6abbe7e1..000000000
--- a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
+++ /dev/null
@@ -1,108 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::cubeRootVolDelta
-
-Description
-    Simple cube-root of cell volume delta used in LES models.
-
-SourceFiles
-    cubeRootVolDelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cubeRootVolDelta_H
-#define cubeRootVolDelta_H
-
-#include "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class cubeRootVolDelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class cubeRootVolDelta
-:
-    public LESdelta
-{
-    // Private data
-
-        scalar deltaCoeff_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        cubeRootVolDelta(const cubeRootVolDelta&);
-        void operator=(const cubeRootVolDelta&);
-
-        // Calculate the delta values
-        void calcDelta();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("cubeRootVol");
-
-
-    // Constructors
-
-        //- Construct from name, mesh and IOdictionary
-        cubeRootVolDelta
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dictionary&
-        );
-
-
-    //- Destructor
-    virtual ~cubeRootVolDelta()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESdelta dictionary
-        virtual void read(const dictionary&);
-
-        // Correct values
-        virtual void correct();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C b/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
deleted file mode 100644
index e4bf785fb..000000000
--- a/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
+++ /dev/null
@@ -1,149 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "maxDeltaxyz.H"
-#include "addToRunTimeSelectionTable.H"
-#include "surfaceFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(maxDeltaxyz, 0);
-addToRunTimeSelectionTable(LESdelta, maxDeltaxyz, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void maxDeltaxyz::calcDelta()
-{
-    label nD = mesh().nGeometricD();
-
-    tmp<volScalarField> hmax
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "hmax",
-                mesh().time().timeName(),
-                mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh(),
-            dimensionedScalar("zrero", dimLength, 0.0)
-        )
-    );
-
-    const cellList& cells = mesh().cells();
-    const vectorField& cellC = mesh().cellCentres();
-    const vectorField& faceC = mesh().faceCentres();
-    const vectorField faceN(mesh().faceAreas()/mag(mesh().faceAreas()));
-
-    forAll(cells, cellI)
-    {
-        scalar deltaMaxTmp = 0.0;
-        const labelList& cFaces = cells[cellI];
-        const point& cc = cellC[cellI];
-
-        forAll(cFaces, cFaceI)
-        {
-            label faceI = cFaces[cFaceI];
-            const point& fc = faceC[faceI];
-            const vector& n = faceN[faceI];
-
-            scalar tmp = magSqr(n*(n & (fc - cc)));
-            if (tmp > deltaMaxTmp)
-            {
-                deltaMaxTmp = tmp;
-            }
-        }
-
-        hmax()[cellI] = deltaCoeff_*sqrt(deltaMaxTmp);
-    }
-
-    if (nD == 3)
-    {
-        delta_.internalField() = hmax();
-    }
-    else if (nD == 2)
-    {
-        WarningIn("maxDeltaxyz::calcDelta()")
-            << "Case is 2D, LES is not strictly applicable\n"
-            << endl;
-
-        delta_.internalField() = hmax();
-    }
-    else
-    {
-        FatalErrorIn("maxDeltaxyz::calcDelta()")
-            << "Case is not 3D or 2D, LES is not applicable"
-            << exit(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-maxDeltaxyz::maxDeltaxyz
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
-)
-:
-    LESdelta(name, mesh),
-    deltaCoeff_(readScalar(dd.subDict(type() + "Coeffs").lookup("deltaCoeff")))
-{
-    calcDelta();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void maxDeltaxyz::read(const dictionary& dd)
-{
-    dd.subDict(type() + "Coeffs").lookup("deltaCoeff") >> deltaCoeff_;
-    calcDelta();
-}
-
-
-void maxDeltaxyz::correct()
-{
-    if (mesh_.changing())
-    {
-        calcDelta();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H b/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
deleted file mode 100644
index 05df8af55..000000000
--- a/src/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H
+++ /dev/null
@@ -1,113 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::maxDeltaxyz
-
-Description
-    Delta calculated by taking the maximum distance between the cell centre
-    and any face centre.  For a regular hex cell, the computed delta will
-    equate to half of the cell width; accordingly, the deltaCoeff model
-    coefficient should be set to 2 for this case.
-
-SourceFiles
-    maxDeltaxyz.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef maxDeltaxyzDelta_H
-#define maxDeltaxyzDelta_H
-
-#include "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class maxDeltaxyz Declaration
-\*---------------------------------------------------------------------------*/
-
-class maxDeltaxyz
-:
-    public LESdelta
-{
-    // Private data
-
-        //- Model coefficient
-        scalar deltaCoeff_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        maxDeltaxyz(const maxDeltaxyz&);
-        void operator=(const maxDeltaxyz&);
-
-        // Calculate the delta values
-        void calcDelta();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("maxDeltaxyz");
-
-
-    // Constructors
-
-        //- Construct from name, mesh and IOdictionary
-        maxDeltaxyz
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dictionary&
-        );
-
-
-    //- Destructor
-    virtual ~maxDeltaxyz()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESdelta dictionary
-        virtual void read(const dictionary&);
-
-        // Correct values
-        virtual void correct();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
deleted file mode 100644
index 1b28e85a0..000000000
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "smoothDelta.H"
-#include "addToRunTimeSelectionTable.H"
-#include "FaceCellWave.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(smoothDelta, 0);
-addToRunTimeSelectionTable(LESdelta, smoothDelta, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// Fill changedFaces (with face labels) and changedFacesInfo (with delta)
-// This is the initial set of faces from which to start the waves.
-// Since there might be lots of places with delta jumps we can follow various
-// strategies for this initial 'seed'.
-// - start from single cell/face and let FaceCellWave pick up all others
-//   from there. might be quite a few waves before everything settles.
-// - start from all faces. Lots of initial transfers.
-// We do something inbetween:
-// - start from all faces where there is a jump. Since we cannot easily
-//   determine this across coupled patches (cyclic, processor) introduce
-//   all faces of these and let FaceCellWave sort it out.
-void smoothDelta::setChangedFaces
-(
-    const polyMesh& mesh,
-    const volScalarField& delta,
-    DynamicList<label>& changedFaces,
-    DynamicList<deltaData>& changedFacesInfo
-)
-{
-    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
-    {
-        scalar ownDelta = delta[mesh.faceOwner()[faceI]];
-
-        scalar neiDelta = delta[mesh.faceNeighbour()[faceI]];
-
-        // Check if owner delta much larger than neighbour delta or vice versa
-
-        if (ownDelta > maxDeltaRatio_ * neiDelta)
-        {
-            changedFaces.append(faceI);
-            changedFacesInfo.append(deltaData(ownDelta));
-        }
-        else if (neiDelta > maxDeltaRatio_ * ownDelta)
-        {
-            changedFaces.append(faceI);
-            changedFacesInfo.append(deltaData(neiDelta));
-        }
-    }
-
-    // Insert all faces of coupled patches no matter what. Let FaceCellWave
-    // sort it out.
-    forAll(mesh.boundaryMesh(), patchI)
-    {
-        const polyPatch& patch = mesh.boundaryMesh()[patchI];
-
-        if (patch.coupled())
-        {
-            forAll(patch, patchFaceI)
-            {
-                label meshFaceI = patch.start() + patchFaceI;
-
-                scalar ownDelta = delta[mesh.faceOwner()[meshFaceI]];
-
-                changedFaces.append(meshFaceI);
-                changedFacesInfo.append(deltaData(ownDelta));
-            }
-        }
-    }
-
-    changedFaces.shrink();
-    changedFacesInfo.shrink();
-}
-
-
-void smoothDelta::calcDelta()
-{
-    const volScalarField& geometricDelta = geometricDelta_();
-
-    // Fill changed faces with info
-    DynamicList<label> changedFaces(mesh_.nFaces()/100 + 100);
-    DynamicList<deltaData> changedFacesInfo(changedFaces.size());
-
-    setChangedFaces(mesh_, geometricDelta, changedFaces, changedFacesInfo);
-
-    // Set initial field on cells.
-    List<deltaData> cellDeltaData(mesh_.nCells());
-
-    forAll(geometricDelta, cellI)
-    {
-        cellDeltaData[cellI] = geometricDelta[cellI];
-    }
-
-    // Set initial field on faces.
-    List<deltaData> faceDeltaData(mesh_.nFaces());
-
-
-    // Propagate information over whole domain.
-    FaceCellWave<deltaData, scalar> deltaCalc
-    (
-        mesh_,
-        changedFaces,
-        changedFacesInfo,
-        faceDeltaData,
-        cellDeltaData,
-        mesh_.globalData().nTotalCells()+1,  // max iterations
-        maxDeltaRatio_
-    );
-
-    forAll(delta_, cellI)
-    {
-        delta_[cellI] = cellDeltaData[cellI].delta();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-smoothDelta::smoothDelta
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
-)
-:
-    LESdelta(name, mesh),
-    geometricDelta_
-    (
-        LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs"))
-    ),
-    maxDeltaRatio_
-    (
-        readScalar(dd.subDict(type() + "Coeffs").lookup("maxDeltaRatio"))
-    )
-{
-    calcDelta();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void smoothDelta::read(const dictionary& d)
-{
-    const dictionary& dd(d.subDict(type() + "Coeffs"));
-
-    geometricDelta_().read(dd);
-    dd.lookup("maxDeltaRatio") >> maxDeltaRatio_;
-    calcDelta();
-}
-
-
-void smoothDelta::correct()
-{
-    geometricDelta_().correct();
-
-    if (mesh_.changing())
-    {
-        calcDelta();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
deleted file mode 100644
index e80d09484..000000000
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
+++ /dev/null
@@ -1,290 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::smoothDelta
-
-Description
-    Smoothed delta which takes a given simple geometric delta and applies
-    smoothing to it such that the ratio of deltas between two cells is no
-    larger than a specified amount, typically 1.15.
-
-SourceFiles
-    smoothDelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef smoothDelta_H
-#define smoothDelta_H
-
-#include "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class smoothDelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class smoothDelta
-:
-    public LESdelta
-{
-public:
-
-    //- Public member class used by mesh-wave to propagate the delta-ratio
-    class deltaData
-    {
-        scalar delta_;
-
-        // Private Member Functions
-
-            //- Update. Gets information from neighbouring face/cell and
-            //  uses this to update itself (if necessary) and return true.
-            template<class TrackingData>
-            inline bool update
-            (
-                const deltaData& w2,
-                const scalar scale,
-                const scalar tol,
-                TrackingData& td
-            );
-
-
-    public:
-
-        // Constructors
-
-            //- Construct null
-            inline deltaData();
-
-            //- Construct from delta value
-            inline deltaData(const scalar delta);
-
-
-        // Member Functions
-
-            // Access
-
-            scalar delta() const
-            {
-                return delta_;
-            }
-
-
-            // Needed by FaceCellWave
-
-                //- Check whether origin has been changed at all or
-                //  still contains original (invalid) value.
-                template<class TrackingData>
-                inline bool valid(TrackingData& td) const;
-
-                //- Check for identical geometrical data.
-                //  Used for cyclics checking.
-                template<class TrackingData>
-                inline bool sameGeometry
-                (
-                    const polyMesh&,
-                    const deltaData&,
-                    const scalar,
-                    TrackingData& td
-                ) const;
-
-                //- Convert any absolute coordinates into relative to
-                //  (patch)face centre
-                template<class TrackingData>
-                inline void leaveDomain
-                (
-                    const polyMesh&,
-                    const polyPatch&,
-                    const label patchFaceI,
-                    const point& faceCentre,
-                    TrackingData& td
-                );
-
-                //- Reverse of leaveDomain
-                template<class TrackingData>
-                inline void enterDomain
-                (
-                    const polyMesh&,
-                    const polyPatch&,
-                    const label patchFaceI,
-                    const point& faceCentre,
-                    TrackingData& td
-                );
-
-                //- Apply rotation matrix to any coordinates
-                template<class TrackingData>
-                inline void transform
-                (
-                    const polyMesh&,
-                    const tensor&,
-                    TrackingData& td
-                );
-
-                //- Influence of neighbouring face.
-                template<class TrackingData>
-                inline bool updateCell
-                (
-                    const polyMesh&,
-                    const label thisCellI,
-                    const label neighbourFaceI,
-                    const deltaData& neighbourInfo,
-                    const scalar tol,
-                    TrackingData& td
-                );
-
-                //- Influence of neighbouring cell.
-                template<class TrackingData>
-                inline bool updateFace
-                (
-                    const polyMesh&,
-                    const label thisFaceI,
-                    const label neighbourCellI,
-                    const deltaData& neighbourInfo,
-                    const scalar tol,
-                    TrackingData& td
-                );
-
-                //- Influence of different value on same face.
-                template<class TrackingData>
-                inline bool updateFace
-                (
-                    const polyMesh&,
-                    const label thisFaceI,
-                    const deltaData& neighbourInfo,
-                    const scalar tol,
-                    TrackingData& td
-                );
-
-                //- Same (like operator==)
-                template<class TrackingData>
-                inline bool equal(const deltaData&, TrackingData& td) const;
-
-            // Member Operators
-
-                // Needed for List IO
-                inline bool operator==(const deltaData&) const;
-
-                inline bool operator!=(const deltaData&) const;
-
-            // IOstream Operators
-
-                friend Ostream& operator<<
-                (
-                    Ostream& os,
-                    const deltaData& wDist
-                )
-                {
-                    return os << wDist.delta_;
-                }
-
-                friend Istream& operator>>(Istream& is, deltaData& wDist)
-                {
-                    return is >> wDist.delta_;
-                }
-    };
-
-
-private:
-
-    // Private data
-
-        autoPtr<LESdelta> geometricDelta_;
-        scalar maxDeltaRatio_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        smoothDelta(const smoothDelta&);
-        void operator=(const smoothDelta&);
-
-        // Calculate the delta values
-        void calcDelta();
-
-
-        void setChangedFaces
-        (
-            const polyMesh& mesh,
-            const volScalarField& delta,
-            DynamicList<label>& changedFaces,
-            DynamicList<deltaData>& changedFacesInfo
-        );
-
-
-public:
-
-    //- Runtime type information
-    TypeName("smooth");
-
-
-    // Constructors
-
-        //- Construct from name, mesh and IOdictionary
-        smoothDelta
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dictionary&
-        );
-
-
-    //- Destructor
-    virtual ~smoothDelta()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESdelta dictionary
-        virtual void read(const dictionary&);
-
-        // Correct values
-        virtual void correct();
-};
-
-
-//- Data associated with deltaData type are contiguous
-template<>
-inline bool contiguous<smoothDelta::deltaData>()
-{
-    return true;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "smoothDeltaDeltaDataI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
deleted file mode 100644
index 16fbd8b51..000000000
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
+++ /dev/null
@@ -1,227 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// Update this with w2 if applicable
-template<class TrackingData>
-inline bool smoothDelta::deltaData::update
-(
-    const smoothDelta::deltaData& w2,
-    const scalar scale,
-    const scalar tol,
-    TrackingData& td
-)
-{
-    if (!valid(td) || (delta_ < VSMALL))
-    {
-        // My delta not set. Take over neighbour.
-        delta_ = w2.delta()/scale;
-
-        // Something changed. Let caller know.
-        return true;
-    }
-    else if (w2.delta() > (1 + tol)*scale*delta_)
-    {
-        // Neighbour is too big for me. Up my delta.
-        delta_ = w2.delta()/scale;
-
-        // Something changed. Let caller know.
-        return true;
-    }
-    else
-    {
-        // Neighbour is not too big for me or change is too small
-        // Nothing changed.
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Null constructor
-inline smoothDelta::deltaData::deltaData()
-:
-    delta_(-GREAT)
-{}
-
-
-// Construct from components
-inline smoothDelta::deltaData::deltaData(const scalar delta)
-:
-    delta_(delta)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class TrackingData>
-inline bool smoothDelta::deltaData::valid(TrackingData& td) const
-{
-    return delta_ > -SMALL;
-}
-
-
-// Checks for cyclic faces
-template<class TrackingData>
-inline bool smoothDelta::deltaData::sameGeometry
-(
-    const polyMesh&,
-    const deltaData&,
-    const scalar,
-    TrackingData& td
-) const
-{
-    return true;
-}
-
-
-template<class TrackingData>
-inline void smoothDelta::deltaData::leaveDomain
-(
-    const polyMesh&,
-    const polyPatch&,
-    const label,
-    const point&,
-    TrackingData& td
-)
-{}
-
-
-template<class TrackingData>
-inline void smoothDelta::deltaData::transform
-(
-    const polyMesh&,
-    const tensor&,
-    TrackingData& td
-)
-{}
-
-
-// Update absolute geometric quantities.
-template<class TrackingData>
-inline void smoothDelta::deltaData::enterDomain
-(
-    const polyMesh&,
-    const polyPatch&,
-    const label,
-    const point&,
-    TrackingData& td
-)
-{}
-
-
-// Update this (cellI) with face information.
-template<class TrackingData>
-inline bool smoothDelta::deltaData::updateCell
-(
-    const polyMesh&,
-    const label,
-    const label,
-    const deltaData& neighbourWallInfo,
-    const scalar tol,
-    TrackingData& td
-)
-{
-    // Take over info from face if more than deltaRatio larger.
-    return update(neighbourWallInfo, td, tol, td);
-}
-
-
-// Update this (face) with cell information.
-template<class TrackingData>
-inline bool smoothDelta::deltaData::updateFace
-(
-    const polyMesh&,
-    const label,
-    const label,
-    const deltaData& neighbourWallInfo,
-    const scalar tol,
-    TrackingData& td
-)
-{
-    // Take over information from cell without any scaling (scale = 1.0)
-    return update(neighbourWallInfo, 1.0, tol, td);
-}
-
-
-// Update this (face) with coupled face information.
-template<class TrackingData>
-inline bool smoothDelta::deltaData::updateFace
-(
-    const polyMesh&,
-    const label,
-    const deltaData& neighbourWallInfo,
-    const scalar tol,
-    TrackingData& td
-)
-{
-    // Take over information from coupled face without any scaling (scale = 1.0)
-    return update(neighbourWallInfo, 1.0, tol, td);
-}
-
-
-template<class TrackingData>
-inline bool smoothDelta::deltaData::equal
-(
-    const deltaData& rhs,
-    TrackingData& td
-) const
-{
-    return operator==(rhs);
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-inline bool smoothDelta::deltaData::operator==
-(
-    const deltaData& rhs
-) const
-{
-    return delta_ == rhs.delta();
-}
-
-
-inline bool smoothDelta::deltaData::operator!=
-(
-    const deltaData& rhs
-) const
-{
-    return !(*this == rhs);
-}
-
-
-// ************************************************************************* //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
deleted file mode 100644
index 041453510..000000000
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ /dev/null
@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(LESfilter, 0);
-    defineRunTimeSelectionTable(LESfilter, dictionary);
-}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::LESfilter> Foam::LESfilter::New
-(
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-{
-    const word filterType(dict.lookup("filter"));
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(filterType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESfilter::New(const fvMesh&, const dictionary&)"
-        )   << "Unknown LESfilter type "
-            << filterType << nl << nl
-            << "Valid LESfilter types are :" << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESfilter>(cstrIter()(mesh, dict));
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
deleted file mode 100644
index 410ada068..000000000
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
+++ /dev/null
@@ -1,158 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::LESfilter
-
-Description
-    Abstract class for LES filters
-
-SourceFiles
-    LESfilter.C
-    newFilter.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LESfilter_H
-#define LESfilter_H
-
-#include "volFields.H"
-#include "typeInfo.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class fvMesh;
-
-/*---------------------------------------------------------------------------*\
-                           Class LESfilter Declaration
-\*---------------------------------------------------------------------------*/
-
-class LESfilter
-{
-    // Private data
-
-        const fvMesh& mesh_;
-
-
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESfilter(const LESfilter&);
-        void operator=(const LESfilter&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LESfilter");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            LESfilter,
-            dictionary,
-            (
-                const fvMesh& mesh,
-                const dictionary& LESfilterDict
-            ),
-            (mesh, LESfilterDict)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        LESfilter(const fvMesh& mesh)
-        :
-            mesh_(mesh)
-        {}
-
-
-    // Selectors
-
-        //- Return a reference to the selected LES filter
-        static autoPtr<LESfilter> New
-        (
-            const fvMesh&,
-            const dictionary&
-        );
-
-
-    //- Destructor
-    virtual ~LESfilter()
-    {}
-
-
-    // Member Functions
-
-        //- Return mesh reference
-        const fvMesh& mesh() const
-        {
-            return mesh_;
-        }
-
-        //- Read the LESfilter dictionary
-        virtual void read(const dictionary&) = 0;
-
-
-    // Member Operators
-
-        virtual tmp<volScalarField> operator()
-        (
-            const tmp<volScalarField>&
-        ) const = 0;
-
-        virtual tmp<volVectorField> operator()
-        (
-            const tmp<volVectorField>&
-        ) const = 0;
-
-        virtual tmp<volSymmTensorField> operator()
-        (
-            const tmp<volSymmTensorField>&
-        ) const = 0;
-
-        virtual tmp<volTensorField> operator()
-        (
-            const tmp<volTensorField>&
-        ) const = 0;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/Make/files b/src/turbulenceModels/LES/LESfilters/Make/files
deleted file mode 100644
index 864b819f3..000000000
--- a/src/turbulenceModels/LES/LESfilters/Make/files
+++ /dev/null
@@ -1,6 +0,0 @@
-LESfilter/LESfilter.C
-simpleFilter/simpleFilter.C
-laplaceFilter/laplaceFilter.C
-anisotropicFilter/anisotropicFilter.C
-
-LIB = $(FOAM_LIBBIN)/libLESfilters
diff --git a/src/turbulenceModels/LES/LESfilters/Make/options b/src/turbulenceModels/LES/LESfilters/Make/options
deleted file mode 100644
index 6d158a432..000000000
--- a/src/turbulenceModels/LES/LESfilters/Make/options
+++ /dev/null
@@ -1,4 +0,0 @@
-EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume
diff --git a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
deleted file mode 100644
index 08ce6197c..000000000
--- a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ /dev/null
@@ -1,239 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "anisotropicFilter.H"
-#include "addToRunTimeSelectionTable.H"
-#include "zeroGradientFvPatchFields.H"
-#include "wallFvPatch.H"
-#include "fvc.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(anisotropicFilter, 0);
-    addToRunTimeSelectionTable(LESfilter, anisotropicFilter, dictionary);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::anisotropicFilter::anisotropicFilter
-(
-    const fvMesh& mesh,
-    scalar widthCoeff
-)
-:
-    LESfilter(mesh),
-    widthCoeff_(widthCoeff),
-    coeff_
-    (
-        IOobject
-        (
-            "anisotropicFilterCoeff",
-            mesh.time().timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedVector("zero", dimLength*dimLength, vector::zero),
-        calculatedFvPatchVectorField::typeName
-    )
-{
-    for (direction d=0; d<vector::nComponents; d++)
-    {
-        coeff_.internalField().replace
-        (
-            d,
-            (1/widthCoeff_)*
-            sqr
-            (
-                2.0*mesh.V()
-               /fvc::surfaceSum(mag(mesh.Sf().component(d)))().internalField()
-            )
-        );
-    }
-}
-
-
-Foam::anisotropicFilter::anisotropicFilter
-(
-    const fvMesh& mesh,
-    const dictionary& bd
-)
-:
-    LESfilter(mesh),
-    widthCoeff_(readScalar(bd.subDict(type() + "Coeffs").lookup("widthCoeff"))),
-    coeff_
-    (
-        IOobject
-        (
-            "anisotropicFilterCoeff",
-            mesh.time().timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedVector("zero", dimLength*dimLength, vector::zero),
-        calculatedFvPatchScalarField::typeName
-    )
-{
-    for (direction d=0; d<vector::nComponents; d++)
-    {
-        coeff_.internalField().replace
-        (
-            d,
-            (1/widthCoeff_)*
-            sqr
-            (
-                2.0*mesh.V()
-               /fvc::surfaceSum(mag(mesh.Sf().component(d)))().internalField()
-            )
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::anisotropicFilter::read(const dictionary& bd)
-{
-    bd.subDict(type() + "Coeffs").lookup("widthCoeff") >> widthCoeff_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::anisotropicFilter::operator()
-(
-    const tmp<volScalarField>& unFilteredField
-) const
-{
-    tmp<volScalarField> tmpFilteredField =
-        unFilteredField
-      + (
-           coeff_
-         & fvc::surfaceIntegrate
-           (
-               mesh().Sf()
-              *fvc::snGrad(unFilteredField())
-           )
-        );
-
-    unFilteredField.clear();
-
-    return tmpFilteredField;
-}
-
-
-Foam::tmp<Foam::volVectorField> Foam::anisotropicFilter::operator()
-(
-    const tmp<volVectorField>& unFilteredField
-) const
-{
-    tmp<volVectorField> tmpFilteredField =
-        unFilteredField
-      + (
-           coeff_
-         & fvc::surfaceIntegrate
-           (
-               mesh().Sf()
-              *fvc::snGrad(unFilteredField())
-           )
-        );
-
-    unFilteredField.clear();
-
-    return tmpFilteredField;
-}
-
-
-Foam::tmp<Foam::volSymmTensorField> Foam::anisotropicFilter::operator()
-(
-    const tmp<volSymmTensorField>& unFilteredField
-) const
-{
-    tmp<volSymmTensorField> tmpFilteredField
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "anisotropicFilteredSymmTensorField",
-                mesh().time().timeName(),
-                mesh()
-            ),
-            mesh(),
-            unFilteredField().dimensions()
-        )
-    );
-
-    for (direction d=0; d<symmTensor::nComponents; d++)
-    {
-        tmpFilteredField().replace
-        (
-            d, anisotropicFilter::operator()(unFilteredField().component(d))
-        );
-    }
-
-    unFilteredField.clear();
-
-    return tmpFilteredField;
-}
-
-
-Foam::tmp<Foam::volTensorField> Foam::anisotropicFilter::operator()
-(
-    const tmp<volTensorField>& unFilteredField
-) const
-{
-    tmp<volTensorField> tmpFilteredField
-    (
-        new volTensorField
-        (
-            IOobject
-            (
-                "anisotropicFilteredTensorField",
-                mesh().time().timeName(),
-                mesh()
-            ),
-            mesh(),
-            unFilteredField().dimensions()
-        )
-    );
-
-    for (direction d=0; d<tensor::nComponents; d++)
-    {
-        tmpFilteredField().replace
-        (
-            d, anisotropicFilter::operator()(unFilteredField().component(d))
-        );
-    }
-
-    unFilteredField.clear();
-
-    return tmpFilteredField;
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
deleted file mode 100644
index aac332e3a..000000000
--- a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
+++ /dev/null
@@ -1,131 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::anisotropicFilter
-
-Description
-    anisotropic filter
-
-    \verbatim
-    Kernel                 as filter          as Test filter with ratio 2
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Box filter:            g = delta2/24  ->  g = delta2/6
-    Spherical box filter:  g = delta2/64  ->  g = delta2/16
-    Gaussian filter:       g = delta2/24  ->  g = delta2/6
-    \endverbatim
-
-SourceFiles
-    anisotropicFilter.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef anisotropicFilter_H
-#define anisotropicFilter_H
-
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class anisotropicFilter Declaration
-\*---------------------------------------------------------------------------*/
-
-class anisotropicFilter
-:
-    public LESfilter
-{
-    // Private data
-
-        scalar widthCoeff_;
-        volVectorField coeff_;
-
-
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        anisotropicFilter(const anisotropicFilter&);
-        void operator=(const anisotropicFilter&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("anisotropic");
-
-    // Constructors
-
-        //- Construct from components
-        anisotropicFilter(const fvMesh& mesh, scalar widthCoeff);
-
-        //- Construct from IOdictionary
-        anisotropicFilter(const fvMesh& mesh, const dictionary&);
-
-
-    //- Destructor
-    virtual ~anisotropicFilter()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESfilter dictionary
-        virtual void read(const dictionary&);
-
-
-    // Member Operators
-
-        virtual tmp<volScalarField> operator()
-        (
-            const tmp<volScalarField>&
-        ) const;
-
-        virtual tmp<volVectorField> operator()
-        (
-            const tmp<volVectorField>&
-        ) const;
-
-        virtual tmp<volSymmTensorField> operator()
-        (
-            const tmp<volSymmTensorField>&
-        ) const;
-
-        virtual tmp<volTensorField> operator()
-        (
-            const tmp<volTensorField>&
-        ) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
deleted file mode 100644
index 24db120ff..000000000
--- a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
+++ /dev/null
@@ -1,151 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "laplaceFilter.H"
-#include "addToRunTimeSelectionTable.H"
-#include "calculatedFvPatchFields.H"
-#include "fvm.H"
-#include "fvc.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(laplaceFilter, 0);
-    addToRunTimeSelectionTable(LESfilter, laplaceFilter, dictionary);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff)
-:
-    LESfilter(mesh),
-    widthCoeff_(widthCoeff),
-    coeff_
-    (
-        IOobject
-        (
-            "laplaceFilterCoeff",
-            mesh.time().timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedScalar("zero", dimLength*dimLength, 0),
-        calculatedFvPatchScalarField::typeName
-    )
-{
-    coeff_.dimensionedInternalField() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
-}
-
-
-Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd)
-:
-    LESfilter(mesh),
-    widthCoeff_(readScalar(bd.subDict(type() + "Coeffs").lookup("widthCoeff"))),
-    coeff_
-    (
-        IOobject
-        (
-            "laplaceFilterCoeff",
-            mesh.time().timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedScalar("zero", dimLength*dimLength, 0),
-        calculatedFvPatchScalarField::typeName
-    )
-{
-    coeff_.dimensionedInternalField() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::laplaceFilter::read(const dictionary& bd)
-{
-    bd.subDict(type() + "Coeffs").lookup("widthCoeff") >> widthCoeff_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::laplaceFilter::operator()
-(
-    const tmp<volScalarField>& unFilteredField
-) const
-{
-    tmp<volScalarField> filteredField =
-        unFilteredField() + fvc::laplacian(coeff_, unFilteredField());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-Foam::tmp<Foam::volVectorField> Foam::laplaceFilter::operator()
-(
-    const tmp<volVectorField>& unFilteredField
-) const
-{
-    tmp<volVectorField> filteredField =
-        unFilteredField() + fvc::laplacian(coeff_, unFilteredField());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-Foam::tmp<Foam::volSymmTensorField> Foam::laplaceFilter::operator()
-(
-    const tmp<volSymmTensorField>& unFilteredField
-) const
-{
-    tmp<volSymmTensorField> filteredField =
-        unFilteredField() + fvc::laplacian(coeff_, unFilteredField());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-Foam::tmp<Foam::volTensorField> Foam::laplaceFilter::operator()
-(
-    const tmp<volTensorField>& unFilteredField
-) const
-{
-    tmp<volTensorField> filteredField =
-        unFilteredField() + fvc::laplacian(coeff_, unFilteredField());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
deleted file mode 100644
index bb7ad27ee..000000000
--- a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
+++ /dev/null
@@ -1,132 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::laplaceFilter
-
-Description
-    Laplace filter for LES
-
-    \verbatim
-    Kernel                 as filter          as Test filter with ratio 2
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Box filter:            g = delta2/24  ->  g = delta2/6
-    Spherical box filter:  g = delta2/64  ->  g = delta2/16
-    Gaussian filter:       g = delta2/24  ->  g = delta2/6
-    \endverbatim
-
-SourceFiles
-    laplaceFilter.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef laplaceFilter_H
-#define laplaceFilter_H
-
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class laplaceFilter Declaration
-\*---------------------------------------------------------------------------*/
-
-class laplaceFilter
-:
-    public LESfilter
-{
-    // Private data
-
-        scalar widthCoeff_;
-        volScalarField coeff_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        laplaceFilter(const laplaceFilter&);
-        void operator=(const laplaceFilter&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("laplace");
-
-
-    // Constructors
-
-        //- Construct from components
-        laplaceFilter(const fvMesh& mesh, scalar widthCoeff);
-
-        //- Construct from IOdictionary
-        laplaceFilter(const fvMesh& mesh, const dictionary&);
-
-
-    //- Destructor
-    virtual ~laplaceFilter()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESfilter dictionary
-        virtual void read(const dictionary&);
-
-
-    // Member Operators
-
-        virtual tmp<volScalarField> operator()
-        (
-            const tmp<volScalarField>&
-        ) const;
-
-        virtual tmp<volVectorField> operator()
-        (
-            const tmp<volVectorField>&
-        ) const;
-
-        virtual tmp<volSymmTensorField> operator()
-        (
-            const tmp<volSymmTensorField>&
-        ) const;
-
-        virtual tmp<volTensorField> operator()
-        (
-            const tmp<volTensorField>&
-        ) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C b/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C
deleted file mode 100644
index d3140fddc..000000000
--- a/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C
+++ /dev/null
@@ -1,128 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "simpleFilter.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvc.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(simpleFilter, 0);
-    addToRunTimeSelectionTable(LESfilter, simpleFilter, dictionary);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::simpleFilter::simpleFilter
-(
-    const fvMesh& mesh
-)
-:
-    LESfilter(mesh)
-{}
-
-
-Foam::simpleFilter::simpleFilter(const fvMesh& mesh, const dictionary&)
-:
-    LESfilter(mesh)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::simpleFilter::read(const dictionary&)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::simpleFilter::operator()
-(
-    const tmp<volScalarField>& unFilteredField
-) const
-{
-    tmp<volScalarField> filteredField = fvc::surfaceSum
-    (
-        mesh().magSf()*fvc::interpolate(unFilteredField)
-    )/fvc::surfaceSum(mesh().magSf());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-Foam::tmp<Foam::volVectorField> Foam::simpleFilter::operator()
-(
-    const tmp<volVectorField>& unFilteredField
-) const
-{
-    tmp<volVectorField> filteredField = fvc::surfaceSum
-    (
-        mesh().magSf()*fvc::interpolate(unFilteredField)
-    )/fvc::surfaceSum(mesh().magSf());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-Foam::tmp<Foam::volSymmTensorField> Foam::simpleFilter::operator()
-(
-    const tmp<volSymmTensorField>& unFilteredField
-) const
-{
-    tmp<volSymmTensorField> filteredField = fvc::surfaceSum
-    (
-        mesh().magSf()*fvc::interpolate(unFilteredField)
-    )/fvc::surfaceSum(mesh().magSf());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-Foam::tmp<Foam::volTensorField> Foam::simpleFilter::operator()
-(
-    const tmp<volTensorField>& unFilteredField
-) const
-{
-    tmp<volTensorField> filteredField = fvc::surfaceSum
-    (
-        mesh().magSf()*fvc::interpolate(unFilteredField)
-    )/fvc::surfaceSum(mesh().magSf());
-
-    unFilteredField.clear();
-
-    return filteredField;
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H b/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
deleted file mode 100644
index f14af21b2..000000000
--- a/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::simpleFilter
-
-Description
-    Simple top-hat filter used in dynamic LES models.
-
-    Implemented as a surface integral of the face interpolate of the field.
-
-SourceFiles
-    simpleFilter.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef simpleFilter_H
-#define simpleFilter_H
-
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class simpleFilter Declaration
-\*---------------------------------------------------------------------------*/
-
-class simpleFilter
-:
-    public LESfilter
-
-{
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        simpleFilter(const simpleFilter&);
-        void operator=(const simpleFilter&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("simple");
-
-
-    // Constructors
-
-        //- Construct from components
-        simpleFilter(const fvMesh& mesh);
-
-        //- Construct from IOdictionary
-        simpleFilter(const fvMesh& mesh, const dictionary&);
-
-
-    //- Destructor
-    virtual ~simpleFilter()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESfilter dictionary
-        virtual void read(const dictionary&);
-
-
-    // Member Operators
-
-        virtual tmp<volScalarField> operator()
-        (
-            const tmp<volScalarField>&
-        ) const;
-
-        virtual tmp<volVectorField> operator()
-        (
-            const tmp<volVectorField>&
-        ) const;
-
-        virtual tmp<volSymmTensorField> operator()
-        (
-            const tmp<volSymmTensorField>&
-        ) const;
-
-        virtual tmp<volTensorField> operator()
-        (
-            const tmp<volTensorField>&
-        ) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/Allwmake b/src/turbulenceModels/compressible/Allwmake
deleted file mode 100755
index ec2033465..000000000
--- a/src/turbulenceModels/compressible/Allwmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-targetType=libso
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
-
-wmake $targetType turbulenceModel
-wmake $targetType RAS
-wmake $targetType LES
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/compressible/LES/DESModel/DESModel.C b/src/turbulenceModels/compressible/LES/DESModel/DESModel.C
deleted file mode 100644
index 74873f49e..000000000
--- a/src/turbulenceModels/compressible/LES/DESModel/DESModel.C
+++ /dev/null
@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
-
-DESModel::DESModel
-(
-    const word& type,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
-)
-:
-    LESModel(type, rho, U, phi, thermoPhysicalModel, turbulenceModelName)
-
-{}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/DESModel/DESModelDoc.H b/src/turbulenceModels/compressible/LES/DESModel/DESModelDoc.H
deleted file mode 100644
index e9deb3208..000000000
--- a/src/turbulenceModels/compressible/LES/DESModel/DESModelDoc.H
+++ /dev/null
@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpCmpDESTurbulence Compressible DES turbulence
-@{
-    \ingroup grpCmpTurbulence
-    This group contains compressible DES models.
-@}
-    
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
deleted file mode 100644
index 6d724be63..000000000
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DeardorffDiffStress.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(DeardorffDiffStress, 0);
-addToRunTimeSelectionTable(LESModel, DeardorffDiffStress, dictionary);
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void DeardorffDiffStress::updateSubGridScaleFields(const volScalarField& K)
-{
-    muSgs_ = ck_*rho()*sqrt(K)*delta();
-    muSgs_.correctBoundaryConditions();
-
-    alphaSgs_ = muSgs_/Prt_;
-    alphaSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-DeardorffDiffStress::DeardorffDiffStress
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-    GenSGSStress(rho, U, phi, thermoPhysicalModel),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.094
-        )
-    ),
-    cm_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cm",
-            coeffDict_,
-            4.13
-        )
-    )
-{
-    updateSubGridScaleFields(0.5*tr(B_));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenSGSStress::correct(gradU);
-
-    volSymmTensorField D(symm(gradU));
-
-    volSymmTensorField P(-rho()*twoSymm(B_ & gradU));
-
-    volScalarField K(0.5*tr(B_));
-
-    tmp<fvSymmTensorMatrix> BEqn
-    (
-        fvm::ddt(rho(), B_)
-      + fvm::div(phi(), B_)
-      - fvm::laplacian(DBEff(), B_)
-      + fvm::Sp(cm_*rho()*sqrt(K)/delta(), B_)
-     ==
-        P
-      + 0.8*rho()*K*D
-      - (2*ce_ - 0.667*cm_)*I*rho()*epsilon()
-    );
-
-    BEqn().relax();
-    BEqn().solve();
-
-    // Bounding the component kinetic energies
-
-    forAll(B_, celli)
-    {
-        B_[celli].component(symmTensor::XX) =
-            max(B_[celli].component(symmTensor::XX), 1.0e-10);
-        B_[celli].component(symmTensor::YY) =
-            max(B_[celli].component(symmTensor::YY), 1.0e-10);
-        B_[celli].component(symmTensor::ZZ) =
-            max(B_[celli].component(symmTensor::ZZ), 1.0e-10);
-    }
-
-    K = 0.5*tr(B_);
-    bound(K, kMin_);
-
-    updateSubGridScaleFields(K);
-}
-
-
-bool DeardorffDiffStress::read()
-{
-    if (GenSGSStress::read())
-    {
-        ck_.readIfPresent(coeffDict());
-        cm_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
deleted file mode 100644
index f84c00f5d..000000000
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::DeardorffDiffStress
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    Differential SGS Stress Equation Model for compressible flows
-
-    The DSEM uses a model version of the full balance equation for the SGS
-    stress tensor to simulate the behaviour of B.
-    Thus,
-    \verbatim
-        d/dt(rho*B) + div(rho*U*B) - div(muSgs*grad(B))
-          =
-            P
-          - c1*rho*epsilon/k*B
-          - 0.667*(1 - c1)*rho*epsilon*I
-          - c2*(P - 0.333*trP*I)
-
-    where
-
-        k = 0.5*trB,
-        epsilon = ce*k^3/2/delta,
-        epsilon/k = ce*k^1/2/delta
-        P = -rho*(B'L + L'B)
-        muSgs = ck*rho*sqrt(k)*delta
-        muEff = muSgs + mu
-    \endverbatim
-
-SourceFiles
-    DeardorffDiffStress.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleDeardorffDiffStress_H
-#define compressibleDeardorffDiffStress_H
-
-#include "GenSGSStress.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class DeardorffDiffStress Declaration
-\*---------------------------------------------------------------------------*/
-
-class DeardorffDiffStress
-:
-    public GenSGSStress
-{
-    // Private data
-
-        dimensionedScalar ck_;
-        dimensionedScalar cm_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volScalarField& K);
-
-        // Disallow default bitwise copy construct and assignment
-        DeardorffDiffStress(const DeardorffDiffStress&);
-        DeardorffDiffStress& operator=(const DeardorffDiffStress&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("DeardorffDiffStress");
-
-    // Constructors
-
-        //- Constructor from components
-        DeardorffDiffStress
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~DeardorffDiffStress()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for B
-        tmp<volScalarField> DBEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DBEff", muSgs_ + mu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
deleted file mode 100644
index d6ceef848..000000000
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ /dev/null
@@ -1,157 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameWithName(GenEddyVisc, "GenEddyVisc");
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-GenEddyVisc::GenEddyVisc
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-
-    ce_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ce",
-            coeffDict_,
-            1.048
-        )
-    ),
-
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    muSgs_
-    (
-        IOobject
-        (
-            "muSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    alphaSgs_
-    (
-        IOobject
-        (
-            "alphaSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    )
-{
-//    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> GenEddyVisc::B() const
-{
-    return ((2.0/3.0)*I)*k() - (muSgs_/rho())*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<volSymmTensorField> GenEddyVisc::devRhoBeff() const
-{
-    return -muEff()*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-void GenEddyVisc::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-}
-
-
-bool GenEddyVisc::read()
-{
-    if (LESModel::read())
-    {
-        ce_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
deleted file mode 100644
index d4af6e5e2..000000000
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
+++ /dev/null
@@ -1,172 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::GenEddyVisc
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    General base class for all compressible models that can be implemented as
-    an eddy viscosity, i.e. algebraic and one-equation models.
-
-    Contains fields for k (SGS turbulent kinetic energy), gamma
-    (modelled viscosity) and epsilon (SGS dissipation).
-
-SourceFiles
-    GenEddyVisc.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleGenEddyVisc_H
-#define compressibleGenEddyVisc_H
-
-#include "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class GenEddyVisc Declaration
-\*---------------------------------------------------------------------------*/
-
-class GenEddyVisc
-:
-    virtual public LESModel
-{
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        GenEddyVisc(const GenEddyVisc&);
-        GenEddyVisc& operator=(const GenEddyVisc&);
-
-
-protected:
-
-    // Model coefficients
-
-        dimensionedScalar ce_;
-        dimensionedScalar Prt_;
-
-
-    // Fields
-
-        volScalarField muSgs_;
-        volScalarField alphaSgs_;
-
-
-public:
-
-    //- Partial Runtime type information
-    static const word typeName;
-
-    // Constructors
-
-        //- Construct from components
-        GenEddyVisc
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~GenEddyVisc()
-    {}
-
-
-    // Member Functions
-
-        //- Return sub-grid disipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (   
-                        "epsilon",
-                        runTime_.timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    ce_*k()*sqrt(k())/delta()
-                )
-            );
-        }
-
-        //- Return viscosity
-        virtual tmp<volScalarField> muSgs() const
-        {
-            return muSgs_;
-        }
-
-        //- Return thermal diffusivity
-        virtual tmp<volScalarField> alphaSgs() const
-        {
-            return alphaSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoBeff() const;
-
-        //- Returns div(rho*dev(B)).
-        // This is the additional term due to the filtering of the NSE.
-        virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
deleted file mode 100644
index f643e2c4b..000000000
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ /dev/null
@@ -1,178 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "GenSGSStress.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameWithName(GenSGSStress, "GenSGSStress");
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-GenSGSStress::GenSGSStress
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-
-    ce_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ce",
-            coeffDict_,
-            1.048
-        )
-    ),
-
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    B_
-    (
-        IOobject
-        (
-            "B",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    muSgs_
-    (
-        IOobject
-        (
-            "muSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    alphaSgs_
-    (
-        IOobject
-        (
-            "alphaSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> GenSGSStress::devRhoBeff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            rho()*B_ - mu()*dev(twoSymm(fvc::grad(U())))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
-{
-    return
-    (
-        fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U))
-      + fvc::laplacian(0.95*muSgs_, U, "laplacian(muEff,U)")
-      - fvm::laplacian(muEff(), U)
-      - fvc::div(mu()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-void GenSGSStress::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-}
-
-
-bool GenSGSStress::read()
-{
-    if (LESModel::read())
-    {
-        ce_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
deleted file mode 100644
index 44eef6da8..000000000
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
+++ /dev/null
@@ -1,198 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::GenSGSStress
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    General base class for all compressible models that directly
-    solve for the SGS stress tensor B.
-
-    Contains tensor fields B (the SGS stress tensor) as well as scalar
-    fields for k (SGS turbulent energy) gamma (SGS viscosity) and epsilon
-    (SGS dissipation).
-
-SourceFiles
-    GenSGSStress.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleGenSGSStress_H
-#define compressibleGenSGSStress_H
-
-#include "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class GenSGSStress Declaration
-\*---------------------------------------------------------------------------*/
-
-class GenSGSStress
-:
-    virtual public LESModel
-{
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        GenSGSStress(const GenSGSStress&);
-        GenSGSStress& operator=(const GenSGSStress&);
-
-
-protected:
-
-    // Model coefficients
-
-        dimensionedScalar ce_;
-        dimensionedScalar Prt_;
-
-    // Fields
-
-        volSymmTensorField B_;
-        volScalarField muSgs_;
-        volScalarField alphaSgs_;
-
-
-public:
-
-    //- Partial Runtime type information
-    static const word typeName;
-
-    // Constructors
-
-        //- Constructor from components
-        GenSGSStress
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~GenSGSStress()
-    {}
-
-
-    // Member Functions
-
-        //- Return the SGS turbulent kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (   
-                        "k",
-                        runTime_.timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    0.5*tr(B_)
-                )
-            );
-        }
-
-        //- Return the SGS turbulent dissipation
-        virtual tmp<volScalarField> epsilon() const
-        {
-            const volScalarField K(k());
-
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (   
-                        "epsilon",
-                        runTime_.timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    ce_*K*sqrt(K)/delta()
-                )
-            );
-        }
-
-        //- Return the SGS viscosity
-        virtual tmp<volScalarField> muSgs() const
-        {
-            return muSgs_;
-        }
-
-        //- Return the SGS thermal diffusivity
-        virtual tmp<volScalarField> alphaSgs() const
-        {
-            return alphaSgs_;
-        }
-
-        //- Return the sub-grid stress tensor
-        virtual tmp<volSymmTensorField> B() const
-        {
-            return B_;
-        }
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoBeff() const;
-
-        //- Returns divergence of B : i.e. the additional term in the
-        //  filtered NSE
-        virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
deleted file mode 100644
index 0a338e290..000000000
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ /dev/null
@@ -1,209 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LESModel.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LESModel, 0);
-defineRunTimeSelectionTable(LESModel, dictionary);
-addToRunTimeSelectionTable(turbulenceModel, LESModel, turbulenceModel);
-
-// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
-
-void LESModel::printCoeffs()
-{
-    if (printCoeffs_)
-    {
-        Info<< type() << "Coeffs" << coeffDict_ << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
-
-LESModel::LESModel
-(
-    const word& type,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
-)
-:
-    turbulenceModel(rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-
-    IOdictionary
-    (
-        IOobject
-        (
-            "LESProperties",
-            U.time().constant(),
-            U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    ),
-
-    printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subOrEmptyDict(type + "Coeffs")),
-
-    kMin_("kMin", sqr(dimVelocity), SMALL),
-
-    delta_(LESdelta::New("delta", U.mesh(), *this))
-{
-    kMin_.readIfPresent(*this);
-
-    // Force the construction of the mesh deltaCoeffs which may be needed
-    // for the construction of the derived models and BCs
-    mesh_.deltaCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<LESModel> LESModel::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "LESProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("LESModel")
-    );
-
-    Info<< "Selecting LES turbulence model " << modelType << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESModel::New"
-            "("
-                "const volScalarField&, "
-                "const volVectorField&, "
-                "const surfaceScalarField&, "
-                "const fluidThermo&, "
-                "const word&"
-            ")"
-        )   << "Unknown LESModel type "
-            << modelType << nl << nl
-            << "Valid LESModel types:" << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESModel>
-    (
-        cstrIter()(rho, U, phi, thermoPhysicalModel, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void LESModel::correct(const tmp<volTensorField>&)
-{
-    turbulenceModel::correct();
-    delta_().correct();
-}
-
-
-void LESModel::correct()
-{
-    correct(fvc::grad(U_));
-}
-
-
-bool LESModel::read()
-{
-    // Bit of trickery : we are both IOdictionary ('RASProperties') and
-    // an regIOobject (from the turbulenceModel). Problem is to distinguish
-    // between the two - we only want to reread the IOdictionary.
-
-    bool ok = IOdictionary::readData
-    (
-        IOdictionary::readStream
-        (
-            IOdictionary::type()
-        )
-    );
-    IOdictionary::close();
-
-    if (ok)
-    {
-        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
-        {
-            coeffDict_ <<= *dictPtr;
-        }
-
-        kMin_.readIfPresent(*this);
-
-        delta_().read(*this);
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
deleted file mode 100644
index 5b4cc39fc..000000000
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ /dev/null
@@ -1,304 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Namespace
-    Foam::compressible::LESModels
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    Namespace for compressible LES models.
-
-Class
-    Foam::compressible::LESModel
-
-Description
-    Base class for all compressible flow LES SGS models.
-
-    This class defines the basic interface for a compressible flow SGS
-    model, and encapsulates data of value to all possible models.
-    In particular this includes references to all the dependent fields
-    (rho, U, phi), the physical viscosity mu, and the LESProperties
-    dictionary, which contains the model selection and model coefficients.
-
-SourceFiles
-    LESModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleLESModel_H
-#define compressibleLESModel_H
-
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "compressible/LES/compressibleLESdelta/compressibleLESdelta.H"
-#include "fvm.H"
-#include "fvc.H"
-#include "fvMatrices.H"
-#include "fluidThermo.H"
-#include "bound.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LESModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class LESModel
-:
-    public turbulenceModel,
-    public IOdictionary
-{
-
-protected:
-
-    // Protected data
-
-        Switch printCoeffs_;
-        dictionary coeffDict_;
-
-        dimensionedScalar kMin_;
-
-        autoPtr<Foam::LESdelta> delta_;
-
-
-    // Protected Member Functions
-
-        //- Print model coefficients
-        virtual void printCoeffs();
-
-
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        LESModel(const LESModel&);
-
-        //- Disallow default bitwise assignment
-        LESModel& operator=(const LESModel&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LESModel");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            LESModel,
-            dictionary,
-            (
-                const volScalarField& rho,
-                const volVectorField& U,
-                const surfaceScalarField& phi,
-                const fluidThermo& thermoPhysicalModel,
-                const word& turbulenceModelName
-            ),
-            (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        LESModel
-        (
-            const word& type,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected LES model
-        static autoPtr<LESModel> New
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    //- Destructor
-    virtual ~LESModel()
-    {}
-
-
-    // Member Functions
-
-        // Access
-
-            //- Const access to the coefficients dictionary,
-            //  which provides info. about choice of models,
-            //  and all related data (particularly model coefficients).
-            virtual const dictionary& coeffDict() const
-            {
-                return coeffDict_;
-            }
-
-            //- Return the lower allowable limit for k (default: SMALL)
-            const dimensionedScalar& kMin() const
-            {
-                return kMin_;
-            }
-
-            //- Allow kMin to be changed
-            dimensionedScalar& kMin()
-            {
-                return kMin_;
-            }
-
-            //- Access function to filter width
-            inline const volScalarField& delta() const
-            {
-                return delta_();
-            }
-
-
-        //- Return the SGS turbulent viscosity
-        virtual tmp<volScalarField> muSgs() const = 0;
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> muEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("muEff", muSgs() + mu())
-            );
-        }
-
-        //- Return the SGS turbulent thermal diffusivity
-        virtual tmp<volScalarField> alphaSgs() const = 0;
-
-        //- Return the effective turbulent temperature diffusivity
-        virtual tmp<volScalarField> kappaEff() const
-        {
-            return thermo().kappaEff(alphaSgs());
-        }
-
-        //- Return the effective turbulent temperature diffusivity for a patch
-        virtual tmp<scalarField> kappaEff(const label patchI) const
-        {
-            return
-                thermo().kappaEff(alphaSgs()().boundaryField()[patchI], patchI);
-        }
-
-        //- Return the effective thermal diffusivity
-        virtual tmp<volScalarField> alphaEff() const
-        {
-            return thermo().alphaEff(alphaSgs());
-        }
-
-        //- Return the effective turbulence thermal diffusivity for a patch
-        virtual tmp<scalarField> alphaEff(const label patchI) const
-        {
-            return
-                thermo().alphaEff(alphaSgs()().boundaryField()[patchI], patchI);
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const = 0;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoBeff() const = 0;
-
-        //- Returns div(rho*dev(B)).
-        // This is the additional term due to the filtering of the NSE.
-        virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const = 0;
-
-
-        // RAS compatibility functions for the turbulenceModel base class
-
-            //- Return the turbulence viscosity
-            virtual tmp<volScalarField> mut() const
-            {
-                return muSgs();
-            }
-
-            //- Return the turbulence thermal diffusivity
-            virtual tmp<volScalarField> alphat() const
-            {
-                return alphaSgs();
-            }
-
-            //- Return the Reynolds stress tensor
-            virtual tmp<volSymmTensorField> R() const
-            {
-                return B();
-            }
-
-            //- Return the effective stress tensor including the laminar stress
-            virtual tmp<volSymmTensorField> devRhoReff() const
-            {
-                return devRhoBeff();
-            }
-
-            //- Return the source term for the momentum equation
-            virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const
-            {
-                return divDevRhoBeff(U);
-            }
-
-
-        //- Correct Eddy-Viscosity and related properties.
-        //  This calls correct(const tmp<volTensorField>& gradU) by supplying
-        //  gradU calculated locally.
-        virtual void correct();
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModelDoc.H b/src/turbulenceModels/compressible/LES/LESModel/LESModelDoc.H
deleted file mode 100644
index ac8c52e36..000000000
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModelDoc.H
+++ /dev/null
@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpCmpLESTurbulence Compressible LES turbulence
-@{
-    \ingroup grpCmpTurbulence
-    This group contains compressible LES models.
-@}
-    
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
deleted file mode 100644
index 58e748577..000000000
--- a/src/turbulenceModels/compressible/LES/Make/files
+++ /dev/null
@@ -1,16 +0,0 @@
-LESModel/LESModel.C
-DESModel/DESModel.C
-GenEddyVisc/GenEddyVisc.C
-GenSGSStress/GenSGSStress.C
-
-Smagorinsky/Smagorinsky.C
-oneEqEddy/oneEqEddy.C
-lowReOneEqEddy/lowReOneEqEddy.C
-homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
-DeardorffDiffStress/DeardorffDiffStress.C
-SpalartAllmaras/SpalartAllmaras.C
-
-compressibleLESdelta/compressibleLESdelta.C
-vanDriestDelta/vanDriestDelta.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
diff --git a/src/turbulenceModels/compressible/LES/Make/options b/src/turbulenceModels/compressible/LES/Make/options
deleted file mode 100644
index 5f392cebf..000000000
--- a/src/turbulenceModels/compressible/LES/Make/options
+++ /dev/null
@@ -1,14 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESfilters/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
-    -lcompressibleTurbulenceModel \
-    -lLESdeltas \
-    -lLESfilters \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
deleted file mode 100644
index 89719bb7e..000000000
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Smagorinsky.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(Smagorinsky, 0);
-addToRunTimeSelectionTable(LESModel, Smagorinsky, dictionary);
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Smagorinsky::updateSubGridScaleFields(const volTensorField& gradU)
-{
-    volSymmTensorField D(symm(gradU));
-
-    volScalarField a(ce_/delta());
-    volScalarField b((2.0/3.0)*tr(D));
-    volScalarField c(2*ck_*delta()*(dev(D) && D));
-
-    volScalarField k(sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a)));
-
-    muSgs_ = ck_*rho()*delta()*sqrt(k);
-    muSgs_.correctBoundaryConditions();
-
-    alphaSgs_ = muSgs_/Prt_;
-    alphaSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Smagorinsky::Smagorinsky
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-    GenEddyVisc(rho, U, phi, thermoPhysicalModel),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.02
-        )
-    )
-{
-    updateSubGridScaleFields(fvc::grad(U));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Smagorinsky::correct(const tmp<volTensorField>& gradU)
-{
-    GenEddyVisc::correct(gradU);
-    updateSubGridScaleFields(gradU());
-}
-
-
-bool Smagorinsky::read()
-{
-    if (GenEddyVisc::read())
-    {
-        ck_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
deleted file mode 100644
index 56821ae60..000000000
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
+++ /dev/null
@@ -1,153 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::Smagorinsky
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    The choric Smagorinsky Model for compressible flows.
-
-    Algebraic eddy viscosity SGS model founded on the assumption that
-    local equilibrium prevails.
-    Thus,
-    \verbatim
-
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        k from rho*D:B + ce*rho*k^3/2/delta = 0
-        muSgs = ck*rho*sqrt(k)*delta
-    \endverbatim
-
-SourceFiles
-    Smagorinsky.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleSmagorinsky_H
-#define compressibleSmagorinsky_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class Smagorinsky Declaration
-\*---------------------------------------------------------------------------*/
-
-class Smagorinsky
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        dimensionedScalar ck_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volTensorField& gradU);
-
-        // Disallow default bitwise copy construct and assignment
-        Smagorinsky(const Smagorinsky&);
-        Smagorinsky& operator=(const Smagorinsky&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("Smagorinsky");
-
-    // Constructors
-
-        //- Construct from components
-        Smagorinsky
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~Smagorinsky()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        //  calculated from the given velocity gradient
-        tmp<volScalarField> k(const tmp<volTensorField>& gradU) const
-        {
-            volSymmTensorField D(symm(gradU));
-
-            volScalarField a(ce_/delta());
-            volScalarField b((2.0/3.0)*tr(D));
-            volScalarField c(2*ck_*delta()*(dev(D) && D));
-
-            return sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a));
-        }
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k(fvc::grad(U()));
-        }
-
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
deleted file mode 100644
index ab6718a0c..000000000
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ /dev/null
@@ -1,445 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "SpalartAllmaras.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
-
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-void SpalartAllmaras::updateSubGridScaleFields()
-{
-    muSgs_.internalField() = rho()*fv1()*nuTilda_.internalField();
-    muSgs_.correctBoundaryConditions();
-
-    alphaSgs_ = muSgs_/Prt_;
-    alphaSgs_.correctBoundaryConditions();
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv1() const
-{
-    volScalarField chi3(pow3(rho()*nuTilda_/mu()));
-    return chi3/(chi3 + pow3(Cv1_));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv2() const
-{
-    if (ashfordCorrection_)
-    {
-        return 1.0/pow3(scalar(1) + rho()*nuTilda_/(mu()*Cv2_));
-    }
-    else
-    {
-        const volScalarField chi("chi", rho()*nuTilda_/mu());
-        return 1.0 - chi/(1.0 + chi*fv1());
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv3() const
-{
-    if (ashfordCorrection_)
-    {
-        volScalarField chi(rho()*nuTilda_/mu());
-        volScalarField chiByCv2((1/Cv2_)*chi);
-
-        return
-            (scalar(1) + chi*fv1())
-           *(1/Cv2_)
-           *(3*(scalar(1) + chiByCv2) + sqr(chiByCv2))
-           /pow3(scalar(1) + chiByCv2);
-    }
-    else
-    {
-        return tmp<volScalarField>
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    "fv3",
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                mesh_,
-                dimensionedScalar("fv3", dimless, 1),
-                zeroGradientFvPatchScalarField::typeName
-            )
-        );
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fw
-(
-    const volScalarField& Stilda,
-    const volScalarField& dTilda
-) const
-{
-    volScalarField r
-    (
-        min
-        (
-            nuTilda_
-           /(
-               max
-               (
-                   Stilda,
-                   dimensionedScalar("SMALL", Stilda.dimensions(), SMALL)
-               )
-              *sqr(kappa_*dTilda)
-            ),
-            scalar(10.0)
-        )
-    );
-    r.boundaryField() == 0.0;
-
-    volScalarField g(r + Cw2_*(pow6(r) - r));
-
-    return g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
-}
-
-
-tmp<volScalarField> SpalartAllmaras::dTilda() const
-{
-    tmp<volScalarField> tdTilda(CDES_*delta());
-    min(tdTilda().dimensionedInternalField(), tdTilda(), y_);
-    return tdTilda;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-SpalartAllmaras::SpalartAllmaras
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    DESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-
-    sigmaNut_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaNut",
-            coeffDict_,
-            0.66666
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    Cb1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb1",
-            coeffDict_,
-            0.1355
-        )
-    ),
-    Cb2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb2",
-            coeffDict_,
-            0.622
-        )
-    ),
-    Cv1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv1",
-            coeffDict_,
-            7.1
-        )
-    ),
-    Cv2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv2",
-            coeffDict_,
-            5.0
-        )
-    ),
-    CDES_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "CDES",
-            coeffDict_,
-            0.65
-        )
-    ),
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.07
-        )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            *this,
-            0.41
-        )
-    ),
-    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
-    Cw2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw2",
-            coeffDict_,
-            0.3
-        )
-    ),
-    Cw3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw3",
-            coeffDict_,
-            2.0
-        )
-    ),
-
-    ashfordCorrection_(coeffDict_.lookupOrDefault("ashfordCorrection", true)),
-
-    y_(wallDist::New(mesh_).y()),
-
-    nuTilda_
-    (
-        IOobject
-        (
-            "nuTilda",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    muSgs_
-    (
-        IOobject
-        (
-            "muSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    alphaSgs_
-    (
-        IOobject
-        (
-            "alphaSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    )
-{
-    updateSubGridScaleFields();
-
-    printCoeffs();
-
-    if (ashfordCorrection_)
-    {
-        Info<< "    Employing Ashford correction" << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> SpalartAllmaras::B() const
-{
-    return ((2.0/3.0)*I)*k() - (muSgs_/rho())*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::devRhoBeff() const
-{
-    return -muEff()*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::epsilon() const
-{
-    return 2*muEff()/rho()*magSqr(symm(fvc::grad(U())));
-}
-
-
-tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-void SpalartAllmaras::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-    LESModel::correct(gradU);
-
-    const volScalarField dTilda(this->dTilda());
-    volScalarField Stilda
-    (
-        fv3()*::sqrt(2.0)*mag(skew(gradU)) + fv2()*nuTilda_/sqr(kappa_*dTilda)
-    );
-
-    tmp<fvScalarMatrix> nuTildaEqn
-    (
-        fvm::ddt(rho(), nuTilda_)
-      + fvm::div(phi(), nuTilda_)
-      - fvm::laplacian
-        (
-            (nuTilda_*rho() + mu())/sigmaNut_,
-            nuTilda_,
-            "laplacian(DnuTildaEff,nuTilda)"
-        )
-      - rho()*Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
-     ==
-        rho()*Cb1_*Stilda*nuTilda_
-      - fvm::Sp(rho()*Cw1_*fw(Stilda, dTilda)*nuTilda_/sqr(dTilda), nuTilda_)
-    );
-
-    nuTildaEqn().relax();
-    nuTildaEqn().solve();
-
-    bound(nuTilda_, dimensionedScalar("zero", nuTilda_.dimensions(), 0.0));
-    nuTilda_.correctBoundaryConditions();
-
-    updateSubGridScaleFields();
-}
-
-
-bool SpalartAllmaras::read()
-{
-    if (LESModel::read())
-    {
-        sigmaNut_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        Cb1_.readIfPresent(coeffDict());
-        Cb2_.readIfPresent(coeffDict());
-        Cv1_.readIfPresent(coeffDict());
-        Cv2_.readIfPresent(coeffDict());
-        CDES_.readIfPresent(coeffDict());
-        ck_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(*this);
-        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
-        Cw2_.readIfPresent(coeffDict());
-        Cw3_.readIfPresent(coeffDict());
-
-        ashfordCorrection_.readIfPresent("ashfordCorrection", coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::LESRegion() const
-{
-    tmp<volScalarField> tLESRegion
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "DES::LESRegion",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            neg(dTilda() - y_)
-        )
-    );
-
-    return tLESRegion;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
deleted file mode 100644
index 133cd6d17..000000000
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ /dev/null
@@ -1,214 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::compressible::LESModels::SpalartAllmaras
-
-Group
-    grpCmpDESTurbulence
-
-Description
-    SpalartAllmaras for compressible flows
-
-    Extended according to
-    \verbatim
-        "An Unstructured Grid Generation and Adaptive Solution Technique
-        for High Reynolds Number Compressible Flows"
-        G.A. Ashford,
-        Ph.D. thesis, University of Michigan, 1996.
-    \endverbatim
-    by using the optional flag \c ashfordCorrection
-
-SourceFiles
-    SpalartAllmaras.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleSpalartAllmaras_H
-#define compressibleSpalartAllmaras_H
-
-#include "DESModel.H"
-#include "volFields.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class SpalartAllmaras Declaration
-\*---------------------------------------------------------------------------*/
-
-class SpalartAllmaras
-:
-    public DESModel
-{
-    // Private data
-
-        // Model coefficients
-
-            dimensionedScalar sigmaNut_;
-            dimensionedScalar Prt_;
-
-            dimensionedScalar Cb1_;
-            dimensionedScalar Cb2_;
-            dimensionedScalar Cv1_;
-            dimensionedScalar Cv2_;
-            dimensionedScalar CDES_;
-            dimensionedScalar ck_;
-            dimensionedScalar kappa_;
-            dimensionedScalar Cw1_;
-            dimensionedScalar Cw2_;
-            dimensionedScalar Cw3_;
-
-
-        //- Optional flag to activate the Ashford correction
-        Switch ashfordCorrection_;
-
-
-        // Fields
-
-            //- Wall distance
-            //  Note: different to wall distance in parent RASModel
-            //  which is for near-wall cells only
-            const volScalarField& y_;
-
-            volScalarField nuTilda_;
-            volScalarField muSgs_;
-            volScalarField alphaSgs_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields();
-
-        tmp<volScalarField> fv1() const;
-        tmp<volScalarField> fv2() const;
-        tmp<volScalarField> fv3() const;
-
-        tmp<volScalarField> fw
-        (
-            const volScalarField& Stilda,
-            const volScalarField& dTilda
-        ) const;
-
-        //- Length scale
-        tmp<volScalarField> dTilda() const;
-
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmaras(const SpalartAllmaras&);
-        SpalartAllmaras& operator=(const SpalartAllmaras&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("SpalartAllmaras");
-
-
-    // Constructors
-
-        //- Constructor from components
-        SpalartAllmaras
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~SpalartAllmaras()
-    {}
-
-
-    // Member Functions
-
-        tmp<volScalarField> nuTilda() const
-        {
-            return nuTilda_;
-        }
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return sqr(muSgs()/rho()/ck_/dTilda());
-        }
-
-        //- Return sub-grid disipation rate
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return SGS viscosity
-        virtual tmp<volScalarField> muSgs() const
-        {
-            return muSgs_;
-        }
-
-        //- Return SGS thermal diffusivity
-        virtual tmp<volScalarField> alphaSgs() const
-        {
-            return alphaSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoBeff() const;
-
-        //- Returns div(rho*dev(B)).
-        // This is the additional term due to the filtering of the NSE.
-        virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
-
-        //- Correct nuTilda and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-
-        //- Return the LES field indicator
-        virtual tmp<volScalarField> LESRegion() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C b/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C
deleted file mode 100644
index 4b8fbbc44..000000000
--- a/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.C
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "compressibleLESdelta.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineRunTimeSelectionTable(LESdelta, dictionary);
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LESdelta::LESdelta(const word& name, const fvMesh& mesh)
-:
-    foamLESdelta(name, mesh)
-{}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<foamLESdelta> LESdelta::New
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-{
-    return foamLESdelta::New(name, mesh, dict, *dictionaryConstructorTablePtr_);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H b/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H
deleted file mode 100644
index 56d1437cc..000000000
--- a/src/turbulenceModels/compressible/LES/compressibleLESdelta/compressibleLESdelta.H
+++ /dev/null
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESdelta
-
-Description
-    Abstract base class for compressible LES deltas
-
-SourceFiles
-    compressibleLESdelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleLESdelta_H
-#define compressibleLESdelta_H
-
-#include "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// To avoid macro problems typedef scoped class
-typedef Foam::LESdelta foamLESdelta;
-
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-                          Class LESdelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class LESdelta
-:
-    public foamLESdelta
-{
-
-public:
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            foamLESdelta,
-            dictionary,
-            (
-                const word& name,
-                const fvMesh& mesh,
-                const dictionary& LESdeltaDict
-            ),
-            (name, mesh, LESdeltaDict)
-        );
-
-    // Constructors
-
-        //- Construct from name and mesh
-        LESdelta(const word& name, const fvMesh& mesh);
-
-
-    // Selectors
-
-        //- Return a reference to the selected LES delta
-        static autoPtr<foamLESdelta> New
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dictionary& dict
-        );
-
-
-    //- Destructor
-    virtual ~LESdelta()
-    {}
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
deleted file mode 100644
index 7b146b89a..000000000
--- a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
+++ /dev/null
@@ -1,191 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "homogeneousDynOneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(homogeneousDynOneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, homogeneousDynOneEqEddy, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void homogeneousDynOneEqEddy::updateSubGridScaleFields
-(
-    const volSymmTensorField& D
-)
-{
-    muSgs_ = ck_(D)*rho()*sqrt(k_)*delta();
-    muSgs_.correctBoundaryConditions();
-
-    alphaSgs_ = muSgs_/Prt_;
-    alphaSgs_.correctBoundaryConditions();
-}
-
-
-dimensionedScalar homogeneousDynOneEqEddy::ck_
-(
-    const volSymmTensorField& D
-) const
-{
-    volScalarField KK(0.5*(filter_(magSqr(U())) - magSqr(filter_(U()))));
-
-    volSymmTensorField LL(dev(filter_(sqr(U())) - (sqr(filter_(U())))));
-
-    volSymmTensorField MM
-    (
-        delta()*(filter_(sqrt(k_)*D) - 2*sqrt(KK + filter_(k_))*filter_(D))
-    );
-
-    return average(LL && MM)/average(magSqr(MM));
-}
-
-
-dimensionedScalar homogeneousDynOneEqEddy::ce_
-(
-    const volSymmTensorField& D
-) const
-{
-    volScalarField KK(0.5*(filter_(magSqr(U())) - magSqr(filter_(U()))));
-
-    volScalarField mm
-    (
-        pow(KK + filter_(k_), 1.5)/(2*delta()) - filter_(pow(k_, 1.5))/delta()
-    );
-
-    volScalarField ee
-    (
-        2*delta()*ck_(D)
-       *(
-            filter_(sqrt(k_)*magSqr(D))
-          - 2*sqrt(KK + filter_(k_))*magSqr(filter_(D))
-        )
-    );
-
-    return average(ee*mm)/average(mm*mm);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-homogeneousDynOneEqEddy::homogeneousDynOneEqEddy
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-    GenEddyVisc(rho, U, phi, thermoPhysicalModel),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
-    filter_(filterPtr_())
-{
-    updateSubGridScaleFields(dev(symm(fvc::grad(U))));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void homogeneousDynOneEqEddy::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenEddyVisc::correct(gradU);
-
-    volSymmTensorField D(dev(symm(gradU)));
-    volScalarField divU(fvc::div(phi()/fvc::interpolate(rho())));
-    volScalarField G(GName(), 2*muSgs_*(gradU && D));
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho(), k_)
-      + fvm::div(phi(), k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G
-      - fvm::SuSp(2.0/3.0*rho()*divU, k_)
-      - fvm::Sp(ce_(D)*rho()*sqrt(k_)/delta(), k_)
-    );
-
-    kEqn().relax();
-    kEqn().solve();
-
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields(D);
-}
-
-
-bool homogeneousDynOneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        filter_.read(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
deleted file mode 100644
index fca371f0d..000000000
--- a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
+++ /dev/null
@@ -1,161 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::homogeneousDynOneEqEddy
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    One Equation Eddy Viscosity Model for compressible flows.
-
-    Eddy viscosity SGS model using a modeled balance equation to simulate
-    the behaviour of k.
-    Thus
-    \verbatim
-        d/dt(k) + div(U*k) - div(nuSgs*grad(k))
-        =
-        -rho*B*L - ce*rho*k^3/2/delta
-
-    and
-
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        nuSgs = ck*sqrt(k)*delta
-    \endverbatim
-
-SourceFiles
-    homogeneousDynOneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleHomogeneousDynOneEqEddy_H
-#define compressibleHomogeneousDynOneEqEddy_H
-
-#include "GenEddyVisc.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class homogeneousDynOneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class homogeneousDynOneEqEddy
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        autoPtr<LESfilter> filterPtr_;
-        LESfilter& filter_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volSymmTensorField& D);
-
-        //- Calculate ck, ce by filtering the velocity field U.
-        dimensionedScalar ck_(const volSymmTensorField& D) const;
-        dimensionedScalar ce_(const volSymmTensorField& D) const;
-
-        // Disallow default bitwise copy construct and assignment
-        homogeneousDynOneEqEddy(const homogeneousDynOneEqEddy&);
-        homogeneousDynOneEqEddy& operator=(const homogeneousDynOneEqEddy&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("homogeneousDynOneEqEddy");
-
-
-    // Constructors
-
-        //- Constructor from components
-        homogeneousDynOneEqEddy
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~homogeneousDynOneEqEddy()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", muSgs_ + mu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
deleted file mode 100644
index 704daaa48..000000000
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ /dev/null
@@ -1,165 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "lowReOneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(lowReOneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, lowReOneEqEddy, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void lowReOneEqEddy::updateSubGridScaleFields()
-{
-    // High Re eddy viscosity
-    muSgs_ = ck_*rho()*sqrt(k_)*delta();
-
-    // low Re no corrected eddy viscosity
-    muSgs_ -= (mu()/beta_)*(scalar(1) - exp(-beta_*muSgs_/mu()));
-    muSgs_.correctBoundaryConditions();
-
-    alphaSgs_ = muSgs_/Prt_;
-    alphaSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-lowReOneEqEddy::lowReOneEqEddy
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-    GenEddyVisc(rho, U, phi, thermoPhysicalModel),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.07
-        )
-    ),
-    beta_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta",
-            coeffDict_,
-            0.01
-        )
-    )
-{
-    updateSubGridScaleFields();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void lowReOneEqEddy::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenEddyVisc::correct(gradU);
-
-    volScalarField divU(fvc::div(phi()/fvc::interpolate(rho())));
-    volScalarField G(GName(), 2*muSgs_*(gradU && dev(symm(gradU))));
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho(), k_)
-      + fvm::div(phi(), k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G
-      - fvm::SuSp(2.0/3.0*rho()*divU, k_)
-      - fvm::Sp(ce_*rho()*sqrt(k_)/delta(), k_)
-    );
-
-    kEqn().relax();
-    kEqn().solve();
-
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields();
-}
-
-
-bool lowReOneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        ck_.readIfPresent(coeffDict());
-        beta_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
deleted file mode 100644
index e3e836d3a..000000000
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
+++ /dev/null
@@ -1,152 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::lowReOneEqEddy
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    One Equation Eddy Viscosity Model for compressible flow
-
-    \verbatim
-        d/dt(rho*k) + div(rho*U*k) - div(muEff*grad(k))
-        =
-        -rho*B*L - ce*rho*k^3/2/delta
-
-    and
-
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-
-    where
-
-        nuSgsHiRe = ck*sqrt(k)*delta
-        nuSgs = (nu/beta)*(1 - exp(-beta*nuSgsHiRe/nu));
-    \endverbatim
-
-SourceFiles
-    lowReOneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleLowReOneEqEddy_H
-#define compressibleLowReOneEqEddy_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class lowReOneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class lowReOneEqEddy
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        dimensionedScalar ck_;
-        dimensionedScalar beta_;
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields();
-
-        // Disallow default bitwise copy construct and assignment
-        lowReOneEqEddy(const lowReOneEqEddy&);
-        lowReOneEqEddy& operator=(const lowReOneEqEddy&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("lowReOneEqEddy");
-
-
-    // Constructors
-
-        //- Constructor from components
-        lowReOneEqEddy
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~lowReOneEqEddy()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", muSgs_ + mu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
deleted file mode 100644
index 537e98ecf..000000000
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ /dev/null
@@ -1,151 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "oneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(oneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, oneEqEddy, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void oneEqEddy::updateSubGridScaleFields()
-{
-    muSgs_ = ck_*rho()*sqrt(k_)*delta();
-    muSgs_.correctBoundaryConditions();
-
-    alphaSgs_ = muSgs_/Prt_;
-    alphaSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-oneEqEddy::oneEqEddy
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermoPhysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
-    GenEddyVisc(rho, U, phi, thermoPhysicalModel),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.094
-        )
-    )
-{
-    updateSubGridScaleFields();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void oneEqEddy::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenEddyVisc::correct(gradU);
-
-    volScalarField divU(fvc::div(phi()/fvc::interpolate(rho())));
-    volScalarField G(GName(), 2*muSgs_*(gradU && dev(symm(gradU))));
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho(), k_)
-      + fvm::div(phi(), k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G
-      - fvm::SuSp(2.0/3.0*rho()*divU, k_)
-      - fvm::Sp(ce_*rho()*sqrt(k_)/delta(), k_)
-    );
-
-    kEqn().relax();
-    kEqn().solve();
-
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields();
-}
-
-
-bool oneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        ck_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
deleted file mode 100644
index 7e0896935..000000000
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ /dev/null
@@ -1,156 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::oneEqEddy
-
-Group
-    grpCmpLESTurbulence
-
-Description
-    One Equation Eddy Viscosity Model for compressible flows
-
-    Eddy viscosity SGS model using a modeled balance equation to simulate the
-    behaviour of k, hence,
-    \verbatim
-        d/dt(rho*k) + div(rho*U*k) - div(muEff*grad(k))
-        =
-        -rho*D:B - ce*rho*k^(3/2)/delta
-
-    and
-
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        nuSgs = ck*sqrt(k)*delta
-        muSgs = rho*nuSgs
-        muEff = muSgs + mu
-    \endverbatim
-
-SourceFiles
-    oneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleOneEqEddy_H
-#define compressibleOneEqEddy_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class oneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class oneEqEddy
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        dimensionedScalar ck_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields();
-
-        // Disallow default bitwise copy construct and assignment
-        oneEqEddy(const oneEqEddy&);
-        oneEqEddy& operator=(const oneEqEddy&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("oneEqEddy");
-
-
-    // Constructors
-
-        //- Constructor from components
-        oneEqEddy
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~oneEqEddy()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", muSgs_ + mu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
deleted file mode 100644
index 8c9137846..000000000
--- a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
+++ /dev/null
@@ -1,161 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "vanDriestDelta.H"
-#include "LESModel.H"
-#include "wallFvPatch.H"
-#include "wallDistData.H"
-#include "wallPointYPlus.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(vanDriestDelta, 0);
-addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void vanDriestDelta::calcDelta()
-{
-    const LESModel& lesModel = mesh_.lookupObject<LESModel>("LESProperties");
-
-    const volVectorField& U = lesModel.U();
-    const volScalarField& rho = lesModel.rho();
-    const volScalarField& mu = lesModel.mu();
-    tmp<volScalarField> muSgs = lesModel.muSgs();
-
-    volScalarField ystar
-    (
-        IOobject
-        (
-            "ystar",
-            mesh_.time().constant(),
-            mesh_
-        ),
-        mesh_,
-        dimensionedScalar("ystar", dimLength, GREAT)
-    );
-
-    const fvPatchList& patches = mesh_.boundary();
-    forAll(patches, patchi)
-    {
-        if (isA<wallFvPatch>(patches[patchi]))
-        {
-            const fvPatchVectorField& Uw = U.boundaryField()[patchi];
-            const scalarField& rhow = rho.boundaryField()[patchi];
-            const scalarField& muw = mu.boundaryField()[patchi];
-            const scalarField& muSgsw = muSgs().boundaryField()[patchi];
-
-            ystar.boundaryField()[patchi] =
-                muw/(rhow*sqrt((muw + muSgsw)*mag(Uw.snGrad())/rhow + VSMALL));
-        }
-    }
-
-    scalar cutOff = wallPointYPlus::yPlusCutOff;
-    wallPointYPlus::yPlusCutOff = 500;
-    wallDistData<wallPointYPlus> y(mesh_, ystar);
-    wallPointYPlus::yPlusCutOff = cutOff;
-
-    delta_ = min
-    (
-        static_cast<const volScalarField&>(geometricDelta_()),
-        (kappa_/Cdelta_)*((scalar(1) + SMALL) - exp(-y/ystar/Aplus_))*y
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-vanDriestDelta::vanDriestDelta
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dd
-)
-:
-    LESdelta(name, mesh),
-    geometricDelta_
-    (
-        LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs"))
-    ),
-    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.41)),
-    Aplus_
-    (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
-    ),
-    Cdelta_
-    (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
-    ),
-    calcInterval_
-    (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<label>("calcInterval", 1)
-    )
-{
-    delta_ = geometricDelta_();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void vanDriestDelta::read(const dictionary& d)
-{
-    const dictionary& dd(d.subDict(type() + "Coeffs"));
-
-    geometricDelta_().read(dd);
-    d.readIfPresent<scalar>("kappa", kappa_);
-    dd.readIfPresent<scalar>("Aplus", Aplus_);
-    dd.readIfPresent<scalar>("Cdelta", Cdelta_);
-    dd.readIfPresent<label>("calcInterval", calcInterval_);
-    calcDelta();
-}
-
-
-void vanDriestDelta::correct()
-{
-    if (mesh().time().timeIndex() % calcInterval_ == 0)
-    {
-        geometricDelta_().correct();
-        calcDelta();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
deleted file mode 100644
index 88e26c755..000000000
--- a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
+++ /dev/null
@@ -1,113 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::LESModels::vanDriestDelta
-
-Description
-    Simple cube-root of cell volume delta used in compressible LES models.
-
-SourceFiles
-    vanDriestDelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef vanDriestDelta_H
-#define vanDriestDelta_H
-
-#include "compressibleLESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class vanDriestDelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class vanDriestDelta
-:
-    public LESdelta
-{
-    // Private data
-
-        autoPtr<Foam::LESdelta> geometricDelta_;
-        scalar kappa_;
-        scalar Aplus_;
-        scalar Cdelta_;
-        label calcInterval_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        vanDriestDelta(const vanDriestDelta&);
-        void operator=(const vanDriestDelta&);
-
-        // Calculate the delta values
-        void calcDelta();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("vanDriest");
-
-
-    // Constructors
-
-        //- Construct from name, mesh and IOdictionary
-        vanDriestDelta(const word& name, const fvMesh& mesh, const dictionary&);
-
-
-    //- Destructor
-    virtual ~vanDriestDelta()
-    {}
-
-
-    // Member Functions
-
-        //- Read the LESdelta dictionary
-        virtual void read(const dictionary&);
-
-        // Correct values
-        virtual void correct();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
deleted file mode 100644
index e17052df0..000000000
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ /dev/null
@@ -1,483 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LRR.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LRR, 0);
-addToRunTimeSelectionTable(RASModel, LRR, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LRR::LRR
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    Clrr1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clrr1",
-            coeffDict_,
-            1.8
-        )
-    ),
-    Clrr2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clrr2",
-            coeffDict_,
-            0.6
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    Cs_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cs",
-            coeffDict_,
-            0.25
-        )
-    ),
-    Ceps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceps",
-            coeffDict_,
-            0.15
-        )
-    ),
-    couplingFactor_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "couplingFactor",
-            coeffDict_,
-            0.0
-        )
-    ),
-    sigmaR_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaR",
-            coeffDict_,
-            0.81967
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    R_
-    (
-        IOobject
-        (
-            "R",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateR("R", mesh_)
-    ),
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateMut("mut", mesh_)
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-    {
-        FatalErrorIn
-        (
-            "LRR::LRR"
-            "( const volScalarField&, const volVectorField&"
-            ", const surfaceScalarField&, fluidThermo&, const word&"
-            ", const word&)"
-        )   << "couplingFactor = " << couplingFactor_
-            << " is not in range 0 - 1" << nl
-            << exit(FatalError);
-    }
-
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> LRR::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            rho_*R_ - mu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
-{
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
-          + fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
-          - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(T(fvc::grad(U))))
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(rho_*R_)
-          + fvc::laplacian(mut_, U)
-          - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(T(fvc::grad(U))))
-        );
-    }
-}
-
-
-bool LRR::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        Clrr1_.readIfPresent(coeffDict());
-        Clrr2_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        Cs_.readIfPresent(coeffDict());
-        Ceps_.readIfPresent(coeffDict());
-        sigmaR_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-        couplingFactor_.readIfPresent(coeffDict());
-
-        if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-        {
-            FatalErrorIn("LRR::read()")
-                << "couplingFactor = " << couplingFactor_
-                << " is not in range 0 - 1" << nl
-                << exit(FatalError);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void LRR::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G(GName(), 0.5*mag(tr(P)));
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-    //- fvm::laplacian(Ceps*rho_*(k_/epsilon_)*R_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1_*rho_*G*epsilon_/k_
-      - fvm::Sp(C2_*rho_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Reynolds stress equation
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-                P[faceCelli] *= min
-                (
-                    G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL),
-                    100.0
-                );
-            }
-        }
-    }
-
-
-    tmp<fvSymmTensorMatrix> REqn
-    (
-        fvm::ddt(rho_, R_)
-      + fvm::div(phi_, R_)
-    //- fvm::laplacian(Cs*rho_*(k_/epsilon_)*R_, R_)
-      - fvm::laplacian(DREff(), R_)
-      + fvm::Sp(Clrr1_*rho_*epsilon_/k_, R_)
-     ==
-        rho_*P
-      - (2.0/3.0*(1 - Clrr1_)*I)*rho_*epsilon_
-      - Clrr2_*rho_*dev(P)
-    );
-
-    REqn().relax();
-    solve(REqn);
-
-    R_.max
-    (
-        dimensionedSymmTensor
-        (
-            "zero",
-            R_.dimensions(),
-            symmTensor
-            (
-                kMin_.value(), -GREAT, -GREAT,
-                kMin_.value(), -GREAT,
-                kMin_.value()
-            )
-        )
-    );
-
-    k_ = 0.5*tr(R_);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-
-    // Correct wall shear stresses
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            symmTensorField& Rw = R_.boundaryField()[patchi];
-
-            const scalarField& rhow = rho_.boundaryField()[patchi];
-            const scalarField& mutw = mut_.boundaryField()[patchi];
-
-            const vectorField snGradU(U_.boundaryField()[patchi].snGrad());
-
-            const vectorField& faceAreas
-                = mesh_.Sf().boundaryField()[patchi];
-
-            const scalarField& magFaceAreas
-                = mesh_.magSf().boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                // Calculate near-wall velocity gradient
-                tensor gradUw
-                    = (faceAreas[facei]/magFaceAreas[facei])*snGradU[facei];
-
-                // Calculate near-wall shear-stress tensor
-                tensor tauw = -(mutw[facei]/rhow[facei])*2*dev(symm(gradUw));
-
-                // Reset the shear components of the stress tensor
-                Rw[facei].xy() = tauw.xy();
-                Rw[facei].xz() = tauw.xz();
-                Rw[facei].yz() = tauw.yz();
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
deleted file mode 100644
index a80bf4171..000000000
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H
+++ /dev/null
@@ -1,210 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::RASModels::LRR
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Launder, Reece and Rodi Reynolds-stress turbulence model for
-    compressible flows.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        LRRCoeffs
-        {
-            Cmu         0.09;
-            Clrr1       1.8;
-            Clrr2       0.6;
-            C1          1.44;
-            C2          1.92;
-            Cs          0.25;
-            Ceps        0.15;
-            Prt         1.0;        // only for compressible
-            sigmaEps    1.3;
-            sigmaR      0.81967;    // only for compressible
-            couplingFactor  0.0;    // only for incompressible
-        }
-    \endverbatim
-
-SourceFiles
-    LRR.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleLRR_H
-#define compressibleLRR_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LRR Declaration
-\*---------------------------------------------------------------------------*/
-
-class LRR
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-
-            dimensionedScalar Clrr1_;
-            dimensionedScalar Clrr2_;
-
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar Cs_;
-            dimensionedScalar Ceps_;
-
-            dimensionedScalar couplingFactor_;
-
-            dimensionedScalar sigmaR_;
-            dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
-
-
-        // Fields
-
-            volSymmTensorField R_;
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LRR");
-
-    // Constructors
-
-        //- Construct from components
-        LRR
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~LRR()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for R
-        tmp<volScalarField> DREff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DREff", mut_/sigmaR_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const
-        {
-            return R_;
-        }
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
deleted file mode 100644
index 60a1a53a1..000000000
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ /dev/null
@@ -1,524 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LaunderGibsonRSTM.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
-addToRunTimeSelectionTable(RASModel, LaunderGibsonRSTM, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LaunderGibsonRSTM::LaunderGibsonRSTM
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            coeffDict_,
-            0.41
-        )
-    ),
-    Clg1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clg1",
-            coeffDict_,
-            1.8
-        )
-    ),
-    Clg2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clg2",
-            coeffDict_,
-            0.6
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    Cs_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cs",
-            coeffDict_,
-            0.25
-        )
-    ),
-    Ceps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceps",
-            coeffDict_,
-            0.15
-        )
-    ),
-    C1Ref_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1Ref",
-            coeffDict_,
-            0.5
-        )
-    ),
-    C2Ref_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2Ref",
-            coeffDict_,
-            0.3
-        )
-    ),
-    couplingFactor_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "couplingFactor",
-            coeffDict_,
-            0.0
-        )
-    ),
-    sigmaR_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaR",
-            coeffDict_,
-            0.81967
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    n_(wallDist::New(mesh_).n()),
-    y_(wallDist::New(mesh_).y()),
-
-    R_
-    (
-        IOobject
-        (
-            "R",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateR("R", mesh_)
-    ),
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateMut("mut", mesh_)
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-    {
-        FatalErrorIn
-        (
-            "LaunderGibsonRSTM::LaunderGibsonRSTM"
-            "(const volScalarField&, const volVectorField&"
-            ", const surfaceScalarField&, fluidThermo&)"
-        )   << "couplingFactor = " << couplingFactor_
-            << " is not in range 0 - 1" << nl
-            << exit(FatalError);
-    }
-
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> LaunderGibsonRSTM::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            rho_*R_ - mu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
-{
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
-          + fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
-          - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(T(fvc::grad(U))))
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(rho_*R_)
-          + fvc::laplacian(mut_, U)
-          - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(T(fvc::grad(U))))
-        );
-    }
-}
-
-
-bool LaunderGibsonRSTM::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(coeffDict());
-        Clg1_.readIfPresent(coeffDict());
-        Clg2_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        Cs_.readIfPresent(coeffDict());
-        Ceps_.readIfPresent(coeffDict());
-        C1Ref_.readIfPresent(coeffDict());
-        C2Ref_.readIfPresent(coeffDict());
-        sigmaR_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        couplingFactor_.readIfPresent(coeffDict());
-
-        if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-        {
-            FatalErrorIn("LaunderGibsonRSTM::read()")
-                << "couplingFactor = " << couplingFactor_
-                << " is not in range 0 - 1" << nl
-                << exit(FatalError);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void LaunderGibsonRSTM::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G(GName(), 0.5*mag(tr(P)));
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-    //- fvm::laplacian(Ceps*rho_*(k_/epsilon_)*R_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1_*rho_*G*epsilon_/k_
-      - fvm::Sp(C2_*rho_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Reynolds stress equation
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-                P[faceCelli] *= min
-                (
-                    G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL),
-                    100.0
-                );
-            }
-        }
-    }
-
-    volSymmTensorField reflect(C1Ref_*epsilon_/k_*R_ - C2Ref_*Clg2_*dev(P));
-
-    tmp<fvSymmTensorMatrix> REqn
-    (
-        fvm::ddt(rho_, R_)
-      + fvm::div(phi_, R_)
-    //- fvm::laplacian(Cs*rho_*(k_/epsilon_)*R_, R_)
-      - fvm::laplacian(DREff(), R_)
-      + fvm::Sp(Clg1_*rho_*epsilon_/k_, R_)
-     ==
-        rho_*P
-      + (2.0/3.0*(Clg1_ - 1)*I)*rho_*epsilon_
-      - Clg2_*rho_*dev(P)
-
-        // wall reflection terms
-      + symm
-        (
-            I*((n_ & reflect) & n_)
-          - 1.5*(n_*(reflect & n_)
-          + (n_ & reflect)*n_)
-        )*pow(Cmu_, 0.75)*rho_*pow(k_, 1.5)/(kappa_*y_*epsilon_)
-    );
-
-    REqn().relax();
-    solve(REqn);
-
-    R_.max
-    (
-        dimensionedSymmTensor
-        (
-            "zero",
-            R_.dimensions(),
-            symmTensor
-            (
-                kMin_.value(), -GREAT, -GREAT,
-                kMin_.value(), -GREAT,
-                kMin_.value()
-            )
-        )
-    );
-
-    k_ == 0.5*tr(R_);
-    bound(k_, kMin_);
-
-
-    // Re-calculate turbulent viscosity
-    mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    // Correct wall shear stresses
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            symmTensorField& Rw = R_.boundaryField()[patchi];
-
-            const scalarField& mutw = mut_.boundaryField()[patchi];
-            const scalarField& rhow = rho_.boundaryField()[patchi];
-
-            const vectorField snGradU(U_.boundaryField()[patchi].snGrad());
-
-            const vectorField& faceAreas
-                = mesh_.Sf().boundaryField()[patchi];
-
-            const scalarField& magFaceAreas
-                = mesh_.magSf().boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                // Calculate near-wall velocity gradient
-                tensor gradUw
-                    = (faceAreas[facei]/magFaceAreas[facei])*snGradU[facei];
-
-                // Calculate near-wall shear-stress tensor
-                tensor tauw = -(mutw[facei]/rhow[facei])*2*dev(symm(gradUw));
-
-                // Reset the shear components of the stress tensor
-                Rw[facei].xy() = tauw.xy();
-                Rw[facei].xz() = tauw.xz();
-                Rw[facei].yz() = tauw.yz();
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
deleted file mode 100644
index b3aa0ddb5..000000000
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ /dev/null
@@ -1,220 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::compressible::RASModels::LaunderGibsonRSTM
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Launder-Gibson Reynolds stress turbulence model for compressible flows.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        LaunderGibsonRSTMCoeffs
-        {
-            Cmu         0.09;
-            kappa       0.41;
-            Clg1        1.8;
-            Clg2        0.6;
-            C1          1.44;
-            C2          1.92;
-            C1Ref       0.5;
-            C2Ref       0.3;
-            Cs          0.25;
-            Ceps        0.15;
-            sigmah      1.0;    // only for compressible
-            sigmaEps    1.3;
-            sigmaR      0.81967;
-            couplingFactor  0.0;
-        }
-    \endverbatim
-
-SourceFiles
-    LaunderGibsonRSTM.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleLaunderGibsonRSTM_H
-#define compressibleLaunderGibsonRSTM_H
-
-#include "RASModel.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LaunderGibsonRSTM Declaration
-\*---------------------------------------------------------------------------*/
-
-class LaunderGibsonRSTM
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar kappa_;
-
-            dimensionedScalar Clg1_;
-            dimensionedScalar Clg2_;
-
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar Cs_;
-            dimensionedScalar Ceps_;
-
-            dimensionedScalar C1Ref_;
-            dimensionedScalar C2Ref_;
-
-            dimensionedScalar couplingFactor_;
-
-            dimensionedScalar sigmaR_;
-            dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
-
-
-        // Fields
-
-            const volVectorField& n_;
-            const volScalarField& y_;
-
-            volSymmTensorField R_;
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LaunderGibsonRSTM");
-
-    // Constructors
-
-        //- Construct from components
-        LaunderGibsonRSTM
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~LaunderGibsonRSTM()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for R
-        tmp<volScalarField> DREff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DREff", mut_/sigmaR_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const
-        {
-            return R_;
-        }
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
deleted file mode 100644
index 6a7d0a1ab..000000000
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ /dev/null
@@ -1,363 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LaunderSharmaKE.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LaunderSharmaKE, 0);
-addToRunTimeSelectionTable(RASModel, LaunderSharmaKE, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> LaunderSharmaKE::fMu() const
-{
-    return exp(-3.4/sqr(scalar(1) + rho_*sqr(k_)/(mu()*epsilon_)/50.0));
-}
-
-
-tmp<volScalarField> LaunderSharmaKE::f2() const
-{
-    return
-        scalar(1)
-      - 0.3*exp(-min(sqr(rho_*sqr(k_)/(mu()*epsilon_)), scalar(50.0)));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LaunderSharmaKE::LaunderSharmaKE
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    C3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C3",
-            coeffDict_,
-            -0.33
-        )
-    ),
-    sigmak_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmak",
-            coeffDict_,
-            1.0
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateLowReMut("mut", mesh_)
-    ),
-
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    mut_ = rho_*Cmu_*fMu()*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> LaunderSharmaKE::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - (mut_/rho_)*dev(twoSymm(fvc::grad(U_))),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> LaunderSharmaKE::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool LaunderSharmaKE::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        C3_.readIfPresent(coeffDict());
-        sigmak_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void LaunderSharmaKE::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ == rho_*Cmu_*fMu()*sqr(k_)/epsilon_;
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    // Calculate parameters and coefficients for Launder-Sharma low-Reynolds
-    // number model
-
-    volScalarField E(2.0*mu()*mut_*fvc::magSqrGradGrad(U_)/rho_);
-    volScalarField D(2.0*mu()*magSqr(fvc::grad(sqrt(k_)))/rho_);
-
-    volScalarField divU(fvc::div(phi_/fvc::interpolate(rho_)));
-
-    if (mesh_.moving())
-    {
-        divU += fvc::div(mesh_.phi());
-    }
-
-    tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G(GName(), mut_*(tgradU() && dev(twoSymm(tgradU()))));
-    tgradU.clear();
-
-
-    // Dissipation equation
-
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1_*G*epsilon_/k_
-      - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*rho_*divU, epsilon_)
-      - fvm::Sp(C2_*f2()*rho_*epsilon_/k_, epsilon_)
-      + E
-    );
-
-    epsEqn().relax();
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho_, k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G - fvm::SuSp(2.0/3.0*rho_*divU, k_)
-      - fvm::Sp(rho_*(epsilon_ + D)/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    mut_ == Cmu_*fMu()*rho_*sqr(k_)/epsilon_;
-
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
deleted file mode 100644
index e107b6793..000000000
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ /dev/null
@@ -1,55 +0,0 @@
-/* RAS turbulence models */
-RASModel/RASModel.C
-laminar/laminar.C
-kEpsilon/kEpsilon.C
-RNGkEpsilon/RNGkEpsilon.C
-LaunderSharmaKE/LaunderSharmaKE.C
-LRR/LRR.C
-LaunderGibsonRSTM/LaunderGibsonRSTM.C
-realizableKE/realizableKE.C
-SpalartAllmaras/SpalartAllmaras.C
-kOmegaSST/kOmegaSST.C
-v2f/v2f.C
-
-/* Wall functions */
-wallFunctions = derivedFvPatchFields/wallFunctions
-
-alphatWallFunctions = $(wallFunctions)/alphatWallFunctions
-$(alphatWallFunctions)/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
-$(alphatWallFunctions)/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
-
-mutWallFunctions = $(wallFunctions)/mutWallFunctions
-$(mutWallFunctions)/mutWallFunction/mutWallFunctionFvPatchScalarField.C
-
-$(mutWallFunctions)/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
-
-$(mutWallFunctions)/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
-
-epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
-$(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
-$(epsilonWallFunctions)/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
-
-fWallFunctions = $(wallFunctions)/fWallFunctions
-$(fWallFunctions)/fWallFunction/fWallFunctionFvPatchScalarField.C
-
-omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
-$(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
-
-kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
-$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
-$(kqRWallFunctions)/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
-
-v2WallFunctions = $(wallFunctions)/v2WallFunctions
-$(v2WallFunctions)/v2WallFunction/v2WallFunctionFvPatchScalarField.C
-
-/* Patch fields */
-derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
-derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
-derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleRASModels
diff --git a/src/turbulenceModels/compressible/RAS/Make/options b/src/turbulenceModels/compressible/RAS/Make/options
deleted file mode 100644
index 8b8e57cd1..000000000
--- a/src/turbulenceModels/compressible/RAS/Make/options
+++ /dev/null
@@ -1,13 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-
-LIB_LIBS = \
-    -lcompressibleTurbulenceModel \
-    -lfiniteVolume \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lmeshTools
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
deleted file mode 100644
index 7e09a4b1a..000000000
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ /dev/null
@@ -1,210 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "RASModel.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(RASModel, 0);
-defineRunTimeSelectionTable(RASModel, dictionary);
-addToRunTimeSelectionTable(turbulenceModel, RASModel, turbulenceModel);
-
-// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
-
-void RASModel::printCoeffs()
-{
-    if (printCoeffs_)
-    {
-        Info<< type() << "Coeffs" << coeffDict_ << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-RASModel::RASModel
-(
-    const word& type,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName
-)
-:
-    turbulenceModel(rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    IOdictionary
-    (
-        IOobject
-        (
-            "RASProperties",
-            U.time().constant(),
-            U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    ),
-
-    turbulence_(lookup("turbulence")),
-    printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subOrEmptyDict(type + "Coeffs")),
-
-    kMin_("kMin", sqr(dimVelocity), SMALL),
-    epsilonMin_("epsilonMin", kMin_.dimensions()/dimTime, SMALL),
-    omegaMin_("omegaMin", dimless/dimTime, SMALL)
-{
-    kMin_.readIfPresent(*this);
-    epsilonMin_.readIfPresent(*this);
-    omegaMin_.readIfPresent(*this);
-
-    // Force the construction of the mesh deltaCoeffs which may be needed
-    // for the construction of the derived models and BCs
-    mesh_.deltaCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-autoPtr<RASModel> RASModel::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "RASProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("RASModel")
-    );
-
-    Info<< "Selecting RAS turbulence model " << modelType << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "RASModel::New"
-            "("
-                "const volScalarField&, "
-                "const volVectorField&, "
-                "const surfaceScalarField&, "
-                "fluidThermo&, "
-                "const word&"
-            ")"
-        )   << "Unknown RASModel type "
-            << modelType << nl << nl
-            << "Valid RASModel types:" << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<RASModel>
-    (
-        cstrIter()(rho, U, phi, thermophysicalModel, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void RASModel::correct()
-{
-    turbulenceModel::correct();
-}
-
-
-bool RASModel::read()
-{
-    //if (regIOobject::read())
-
-    // Bit of trickery : we are both IOdictionary ('RASProperties') and
-    // an regIOobject from the turbulenceModel level. Problem is to distinguish
-    // between the two - we only want to reread the IOdictionary.
-
-    bool ok = IOdictionary::readData
-    (
-        IOdictionary::readStream
-        (
-            IOdictionary::type()
-        )
-    );
-    IOdictionary::close();
-
-    if (ok)
-    {
-        lookup("turbulence") >> turbulence_;
-
-        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
-        {
-            coeffDict_ <<= *dictPtr;
-        }
-
-        kMin_.readIfPresent(*this);
-        epsilonMin_.readIfPresent(*this);
-        omegaMin_.readIfPresent(*this);
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
deleted file mode 100644
index 6780860b8..000000000
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ /dev/null
@@ -1,268 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-Namespace
-    Foam::compressible::RASModels
-
-Description
-    Namespace for compressible RAS turbulence models.
-
-Class
-    Foam::compressible::RASModel
-
-Description
-    Abstract base class for turbulence models for compressible and combusting
-    flows.
-
-SourceFiles
-    RASModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleRASModel_H
-#define compressibleRASModel_H
-
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "fvm.H"
-#include "fvc.H"
-#include "fvMatrices.H"
-#include "fluidThermo.H"
-#include "IOdictionary.H"
-#include "Switch.H"
-#include "bound.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class RASModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class RASModel
-:
-    public turbulenceModel,
-    public IOdictionary
-{
-
-protected:
-
-    // Protected data
-
-        //- Turbulence on/off flag
-        Switch turbulence_;
-
-        //- Flag to print the model coeffs at run-time
-        Switch printCoeffs_;
-
-        //- Model coefficients dictionary
-        dictionary coeffDict_;
-
-        //- Lower limit of k
-        dimensionedScalar kMin_;
-
-        //- Lower limit of epsilon
-        dimensionedScalar epsilonMin_;
-
-        //- Lower limit for omega
-        dimensionedScalar omegaMin_;
-
-
-    // Protected Member Functions
-
-        //- Print model coefficients
-        virtual void printCoeffs();
-
-
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        RASModel(const RASModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const RASModel&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("RASModel");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            RASModel,
-            dictionary,
-            (
-                const volScalarField& rho,
-                const volVectorField& U,
-                const surfaceScalarField& phi,
-                const fluidThermo& thermoPhysicalModel,
-                const word& turbulenceModelName
-            ),
-            (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        RASModel
-        (
-            const word& type,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected RAS model
-        static autoPtr<RASModel> New
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    //- Destructor
-    virtual ~RASModel()
-    {}
-
-
-    // Member Functions
-
-        // Access
-
-            //- Return the lower allowable limit for k (default: SMALL)
-            const dimensionedScalar& kMin() const
-            {
-                return kMin_;
-            }
-
-            //- Return the lower allowable limit for epsilon (default: SMALL)
-            const dimensionedScalar& epsilonMin() const
-            {
-                return epsilonMin_;
-            }
-
-            //- Return the lower allowable limit for omega (default: SMALL)
-            const dimensionedScalar& omegaMin() const
-            {
-                return omegaMin_;
-            }
-
-            //- Allow kMin to be changed
-            dimensionedScalar& kMin()
-            {
-                return kMin_;
-            }
-
-            //- Allow epsilonMin to be changed
-            dimensionedScalar& epsilonMin()
-            {
-                return epsilonMin_;
-            }
-
-            //- Allow omegaMin to be changed
-            dimensionedScalar& omegaMin()
-            {
-                return omegaMin_;
-            }
-
-            //- Const access to the coefficients dictionary
-            virtual const dictionary& coeffDict() const
-            {
-                return coeffDict_;
-            }
-
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> muEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("muEff", mut() + mu())
-            );
-        }
-
-        //- Return the effective turbulent temperature diffusivity
-        virtual tmp<volScalarField> kappaEff() const
-        {
-            return thermo().kappaEff(alphat());
-        }
-
-        //- Return the effective turbulent temperature diffusivity for a patch
-        virtual tmp<scalarField> kappaEff(const label patchI) const
-        {
-            return thermo().kappaEff(alphat(patchI), patchI);
-        }
-
-        //- Return the effective turbulent thermal diffusivity
-        virtual tmp<volScalarField> alphaEff() const
-        {
-            return thermo().alphaEff(alphat());
-        }
-
-        //- Return the effective turbulent thermal diffusivity for a patch
-        virtual tmp<scalarField> alphaEff(const label patchI) const
-        {
-            return thermo().alphaEff(alphat(patchI), patchI);
-        }
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
deleted file mode 100644
index 58ad1f571..000000000
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ /dev/null
@@ -1,372 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "RNGkEpsilon.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(RNGkEpsilon, 0);
-addToRunTimeSelectionTable(RASModel, RNGkEpsilon, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-RNGkEpsilon::RNGkEpsilon
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.0845
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.42
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.68
-        )
-    ),
-    C3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C3",
-            coeffDict_,
-            -0.33
-        )
-    ),
-    sigmak_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmak",
-            coeffDict_,
-            0.71942
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            0.71942
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-    eta0_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "eta0",
-            coeffDict_,
-            4.38
-        )
-    ),
-    beta_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta",
-            coeffDict_,
-            0.012
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateMut("mut", mesh_)
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> RNGkEpsilon::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - (mut_/rho_)*dev(twoSymm(fvc::grad(U_))),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> RNGkEpsilon::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool RNGkEpsilon::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        C3_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-        eta0_.readIfPresent(coeffDict());
-        beta_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void RNGkEpsilon::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volScalarField divU(fvc::div(phi_/fvc::interpolate(rho_)));
-
-    if (mesh_.moving())
-    {
-        divU += fvc::div(mesh_.phi());
-    }
-
-    tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField S2((tgradU() && dev(twoSymm(tgradU()))));
-    tgradU.clear();
-
-    volScalarField G(GName(), mut_*S2);
-
-    volScalarField eta(sqrt(mag(S2))*k_/epsilon_);
-    volScalarField eta3(eta*sqr(eta));
-
-    volScalarField R
-    (
-        ((eta*(-eta/eta0_ + scalar(1)))/(beta_*eta3 + scalar(1)))
-    );
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-      ==
-        (C1_ - R)*G*epsilon_/k_
-      - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*rho_*divU, epsilon_)
-      - fvm::Sp(C2_*rho_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho_, k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-      ==
-        G - fvm::SuSp(2.0/3.0*rho_*divU, k_)
-      - fvm::Sp(rho_*epsilon_/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
deleted file mode 100644
index ba8061365..000000000
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ /dev/null
@@ -1,210 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::compressible::RASModels::RNGkEpsilon
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Renormalisation group k-epsilon turbulence model for compressible flows
-    including rapid distortion theory (RDT) based compression term.
-
-    References:
-    \verbatim
-        "Development of Turbulence Models for Shear Flow by a
-         Double Expansion Technique",
-        Yakhot, V., Orszag, S.A., Thangam, S., Gatski, T.B. and Speziale, C.G.",
-        Physics of Fluids A, Vol. 4, No. 7, 1992, pp 1510-1520.
-
-        For the RDT-based compression term:
-        "k-epsilon equations for compressible reciprocating engine flows"
-        El Tahry, S. H.,
-        AIAA Journal of Energy 7, 1983, pp 345-353.
-    \endverbatim
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        RNGkEpsilonCoeffs
-        {
-            Cmu         0.0845;
-            C1          1.42;
-            C2          1.68;
-            C3          -0.33;  // only for compressible
-            Prt         1.0;    // only for compressible
-            sigmak      0.71942;
-            sigmaEps    0.71942;
-            eta0        4.38;
-            beta        0.012;
-        }
-    \endverbatim
-
-SourceFiles
-    RNGkEpsilon.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleRNGkEpsilon_H
-#define compressibleRNGkEpsilon_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class RNGkEpsilon Declaration
-\*---------------------------------------------------------------------------*/
-
-class RNGkEpsilon
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar C3_;
-            dimensionedScalar sigmak_;
-            dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
-            dimensionedScalar eta0_;
-            dimensionedScalar beta_;
-
-        // Fields
-
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("RNGkEpsilon");
-
-    // Constructors
-
-        //- Construct from components
-        RNGkEpsilon
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~RNGkEpsilon()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", mut_/sigmak_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
deleted file mode 100644
index bd54bd80f..000000000
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ /dev/null
@@ -1,479 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "SpalartAllmaras.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(RASModel, SpalartAllmaras, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> SpalartAllmaras::chi() const
-{
-    return rho_*nuTilda_/mu();
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv1(const volScalarField& chi) const
-{
-    const volScalarField chi3(pow3(chi));
-    return chi3/(chi3 + pow3(Cv1_));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv2
-(
-    const volScalarField& chi,
-    const volScalarField& fv1
-) const
-{
-    if (ashfordCorrection_)
-    {
-        return 1.0/pow3(scalar(1) + chi/Cv2_);
-    }
-    else
-    {
-        return 1.0 - chi/(1.0 + chi*fv1);
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv3
-(
-    const volScalarField& chi,
-    const volScalarField& fv1
-) const
-{
-    if (ashfordCorrection_)
-    {
-        const volScalarField chiByCv2((1/Cv2_)*chi);
-
-        return
-            (scalar(1) + chi*fv1)
-           *(1/Cv2_)
-           *(3*(scalar(1) + chiByCv2) + sqr(chiByCv2))
-           /pow3(scalar(1) + chiByCv2);
-    }
-    else
-    {
-        return tmp<volScalarField>
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    "fv3",
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                mesh_,
-                dimensionedScalar("fv3", dimless, 1),
-                zeroGradientFvPatchScalarField::typeName
-            )
-        );
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fw(const volScalarField& Stilda) const
-{
-    volScalarField r
-    (
-        min
-        (
-            nuTilda_
-           /(
-               max
-               (
-                   Stilda,
-                   dimensionedScalar("SMALL", Stilda.dimensions(), SMALL)
-               )
-              *sqr(kappa_*y_)
-            ),
-            scalar(10.0)
-        )
-    );
-    r.boundaryField() == 0.0;
-
-    const volScalarField g(r + Cw2_*(pow6(r) - r));
-
-    return g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-SpalartAllmaras::SpalartAllmaras
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    sigmaNut_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaNut",
-            coeffDict_,
-            0.66666
-        )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            coeffDict_,
-            0.41
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    Cb1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb1",
-            coeffDict_,
-            0.1355
-        )
-    ),
-    Cb2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb2",
-            coeffDict_,
-            0.622
-        )
-    ),
-    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
-    Cw2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw2",
-            coeffDict_,
-            0.3
-        )
-    ),
-    Cw3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw3",
-            coeffDict_,
-            2.0
-        )
-    ),
-    Cv1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv1",
-            coeffDict_,
-            7.1
-        )
-    ),
-    Cv2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv2",
-            coeffDict_,
-            5.0
-        )
-    ),
-
-    nuTilda_
-    (
-        IOobject
-        (
-            "nuTilda",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    ),
-
-    y_(wallDist::New(mesh_).y())
-{
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-
-    if (ashfordCorrection_)
-    {
-        Info<< "    Employing Ashford correction" << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> SpalartAllmaras::k() const
-{
-    WarningIn("tmp<volScalarField> SpalartAllmaras::k() const")
-        << "Turbulence kinetic energy not defined for Spalart-Allmaras model. "
-        << "Returning zero field" << endl;
-
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_
-            ),
-            mesh_,
-            dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
-        )
-    );
-}
-
-
-tmp<volScalarField> SpalartAllmaras::epsilon() const
-{
-    WarningIn("tmp<volScalarField> SpalartAllmaras::epsilon() const")
-        << "Turbulence kinetic energy dissipation rate not defined for "
-        << "Spalart-Allmaras model. Returning zero field"
-        << endl;
-
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "epsilon",
-                runTime_.timeName(),
-                mesh_
-            ),
-            mesh_,
-            dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k() - (mut_/rho_)*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
-{
-    const volScalarField muEff_(muEff());
-
-    return
-    (
-      - fvm::laplacian(muEff_, U)
-      - fvc::div(muEff_*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool SpalartAllmaras::read()
-{
-    if (RASModel::read())
-    {
-        sigmaNut_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        Cb1_.readIfPresent(coeffDict());
-        Cb2_.readIfPresent(coeffDict());
-        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
-        Cw2_.readIfPresent(coeffDict());
-        Cw3_.readIfPresent(coeffDict());
-        Cv1_.readIfPresent(coeffDict());
-        Cv2_.readIfPresent(coeffDict());
-
-        ashfordCorrection_.readIfPresent("ashfordCorrection", coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void SpalartAllmaras::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rho_*nuTilda_*fv1(chi());
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    const volScalarField chi(this->chi());
-    const volScalarField fv1(this->fv1(chi));
-
-    const volScalarField Stilda
-    (
-        fv3(chi, fv1)*::sqrt(2.0)*mag(skew(fvc::grad(U_)))
-      + fv2(chi, fv1)*nuTilda_/sqr(kappa_*y_)
-    );
-
-    tmp<fvScalarMatrix> nuTildaEqn
-    (
-        fvm::ddt(rho_, nuTilda_)
-      + fvm::div(phi_, nuTilda_)
-      - fvm::laplacian(DnuTildaEff(), nuTilda_)
-      - Cb2_/sigmaNut_*rho_*magSqr(fvc::grad(nuTilda_))
-     ==
-        Cb1_*rho_*Stilda*nuTilda_
-      - fvm::Sp(Cw1_*fw(Stilda)*nuTilda_*rho_/sqr(y_), nuTilda_)
-    );
-
-    nuTildaEqn().relax();
-    solve(nuTildaEqn);
-    bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
-    nuTilda_.correctBoundaryConditions();
-
-    // Re-calculate viscosity
-    mut_.internalField() = fv1*nuTilda_.internalField()*rho_.internalField();
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
deleted file mode 100644
index 0d366d71b..000000000
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ /dev/null
@@ -1,233 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::compressible::RASModels::SpalartAllmaras
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Spalart-Allmaras one-eqn mixing-length model for compressible
-    external flows.
-
-    Reference:
-    \verbatim
-        "A One-Equation Turbulence Model for Aerodynamic Flows"
-        P.R. Spalart,
-        S.R. Allmaras,
-        La Recherche Aerospatiale, No. 1, 1994, pp. 5-21.
-    \endverbatim
-
-    Extended according to:
-    \verbatim
-        "An Unstructured Grid Generation and Adaptive Solution Technique
-        for High Reynolds Number Compressible Flows"
-        G.A. Ashford,
-        Ph.D. thesis, University of Michigan, 1996.
-    \endverbatim
-    by using the optional flag \c ashfordCorrection
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        SpalartAllmarasCoeffs
-        {
-            Cb1         0.1355;
-            Cb2         0.622;
-            Cw2         0.3;
-            Cw3         2.0;
-            Cv1         7.1;
-            Cv2         5.0;
-            sigmaNut    0.66666;
-            Prt         1.0;    // only for compressible
-            kappa       0.41;
-        }
-    \endverbatim
-
-SourceFiles
-    SpalartAllmaras.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleSpalartAllmaras_H
-#define compressibleSpalartAllmaras_H
-
-#include "RASModel.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                      Class SpalartAllmaras Declaration
-\*---------------------------------------------------------------------------*/
-
-class SpalartAllmaras
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar sigmaNut_;
-            dimensionedScalar kappa_;
-            dimensionedScalar Prt_;
-
-            dimensionedScalar Cb1_;
-            dimensionedScalar Cb2_;
-            dimensionedScalar Cw1_;
-            dimensionedScalar Cw2_;
-            dimensionedScalar Cw3_;
-            dimensionedScalar Cv1_;
-            dimensionedScalar Cv2_;
-
-
-        //- Optional flag to activate the Ashford correction
-        Switch ashfordCorrection_;
-
-
-        // Fields
-
-            volScalarField nuTilda_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-            //- Wall distance
-            //  Note: different to wall distance in parent RASModel
-            //  which is for near-wall cells only
-            const volScalarField& y_;
-
-
-    // Protected Member Functions
-
-        tmp<volScalarField> chi() const;
-        tmp<volScalarField> fv1(const volScalarField& chi) const;
-        tmp<volScalarField> fv2
-        (
-            const volScalarField& chi,
-            const volScalarField& fv1
-        ) const;
-        tmp<volScalarField> fv3
-        (
-            const volScalarField& chi,
-            const volScalarField& fv1
-        ) const;
-        tmp<volScalarField> fw(const volScalarField& Stilda) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("SpalartAllmaras");
-
-
-    // Constructors
-
-        //- Construct from components
-        SpalartAllmaras
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~SpalartAllmaras()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for nuTilda
-        tmp<volScalarField> DnuTildaEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    "DnuTildaEff",
-                    (rho_*nuTilda_ + mu())/sigmaNut_
-                )
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const;
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
deleted file mode 100644
index 7846bec82..000000000
--- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+++ /dev/null
@@ -1,357 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-#include "volFields.H"
-#include "calculatedFvPatchField.H"
-#include "alphatWallFunctionFvPatchScalarField.H"
-#include "mutkWallFunctionFvPatchScalarField.H"
-#include "mutLowReWallFunctionFvPatchScalarField.H"
-#include "epsilonWallFunctionFvPatchScalarField.H"
-#include "kqRWallFunctionFvPatchField.H"
-#include "omegaWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-tmp<volScalarField> autoCreateAlphat
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject alphatHeader
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-
-    if (alphatHeader.headerOk())
-    {
-        return tmp<volScalarField>(new volScalarField(alphatHeader, mesh));
-    }
-    else
-    {
-        Info<< "--> Creating " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        const fvBoundaryMesh& bm = mesh.boundary();
-
-        wordList alphatBoundaryTypes(bm.size());
-
-        forAll(bm, patchI)
-        {
-            if (isA<wallFvPatch>(bm[patchI]))
-            {
-                alphatBoundaryTypes[patchI] =
-                    alphatWallFunctionFvPatchScalarField::typeName;
-            }
-            else
-            {
-                alphatBoundaryTypes[patchI] =
-                    calculatedFvPatchField<scalar>::typeName;
-            }
-        }
-
-        tmp<volScalarField> alphat
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0),
-                alphatBoundaryTypes
-            )
-        );
-
-        Info<< "    Writing new " << fieldName << endl;
-        alphat().write();
-
-        return alphat;
-    }
-}
-
-
-tmp<volScalarField> autoCreateMut
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject mutHeader
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-
-    if (mutHeader.headerOk())
-    {
-        return tmp<volScalarField>(new volScalarField(mutHeader, mesh));
-    }
-    else
-    {
-        Info<< "--> Creating " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        const fvBoundaryMesh& bm = mesh.boundary();
-
-        wordList mutBoundaryTypes(bm.size());
-
-        forAll(bm, patchI)
-        {
-            if (isA<wallFvPatch>(bm[patchI]))
-            {
-                mutBoundaryTypes[patchI] =
-                    mutkWallFunctionFvPatchScalarField::typeName;
-            }
-            else
-            {
-                mutBoundaryTypes[patchI] =
-                    calculatedFvPatchField<scalar>::typeName;
-            }
-        }
-
-        tmp<volScalarField> mut
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0),
-                mutBoundaryTypes
-            )
-        );
-
-        Info<< "    Writing new " << fieldName << endl;
-        mut().write();
-
-        return mut;
-    }
-}
-
-
-tmp<volScalarField> autoCreateLowReMut
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject mutHeader
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-
-    if (mutHeader.headerOk())
-    {
-        return tmp<volScalarField>(new volScalarField(mutHeader, mesh));
-    }
-    else
-    {
-        Info<< "--> Creating " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        const fvBoundaryMesh& bm = mesh.boundary();
-
-        wordList mutBoundaryTypes(bm.size());
-
-        forAll(bm, patchI)
-        {
-            if (isA<wallFvPatch>(bm[patchI]))
-            {
-                mutBoundaryTypes[patchI] =
-                    mutLowReWallFunctionFvPatchScalarField::typeName;
-            }
-            else
-            {
-                mutBoundaryTypes[patchI] =
-                    calculatedFvPatchField<scalar>::typeName;
-            }
-        }
-
-        tmp<volScalarField> mut
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0),
-                mutBoundaryTypes
-            )
-        );
-
-        Info<< "    Writing new " << fieldName << endl;
-        mut().write();
-
-        return mut;
-    }
-}
-
-
-tmp<volScalarField> autoCreateEpsilon
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            epsilonWallFunctionFvPatchScalarField
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volScalarField> autoCreateOmega
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            omegaWallFunctionFvPatchScalarField
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volScalarField> autoCreateK
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            kqRWallFunctionFvPatchField<scalar>
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volScalarField> autoCreateQ
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            kqRWallFunctionFvPatchField<scalar>
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volSymmTensorField> autoCreateR
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            symmTensor,
-            kqRWallFunctionFvPatchField<symmTensor>
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
-
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
deleted file mode 100644
index c2b34c4a6..000000000
--- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
+++ /dev/null
@@ -1,129 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::compressible
-
-Description
-    Auto creation of fields to provide backwards compatibility with
-    runtime selectable wall functions
-
-SourceFiles
-    backwardsCompatibilityWallFunctions.C
-    backwardsCompatibilityWallFunctionsTemplates.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef backwardsCompatibilityWallFunctions_H
-#define backwardsCompatibilityWallFunctions_H
-
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-    //- mut
-    tmp<volScalarField> autoCreateMut
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- mut for Low-Reynolds number models
-    tmp<volScalarField> autoCreateLowReMut
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- alphat
-    tmp<volScalarField> autoCreateAlphat
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- epsilon
-    tmp<volScalarField> autoCreateEpsilon
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- omega
-    tmp<volScalarField> autoCreateOmega
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- k
-    tmp<volScalarField> autoCreateK
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- Q
-    tmp<volScalarField> autoCreateQ
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- R
-    tmp<volSymmTensorField> autoCreateR
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- Helper function to create the new field
-    template<class Type, class PatchType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> >
-    autoCreateWallFunctionField
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "backwardsCompatibilityWallFunctionsTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
deleted file mode 100644
index d91f1bcd7..000000000
--- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "backwardsCompatibilityWallFunctions.H"
-#include "Time.H"
-#include "OSspecific.H"
-
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type, class PatchType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
-autoCreateWallFunctionField
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject mutHeader
-    (
-        "mut",
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ
-    );
-
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
-
-    if (mutHeader.headerOk())
-    {
-        return tmp<fieldType>
-        (
-            new fieldType
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh
-            )
-        );
-    }
-    else
-    {
-        Info<< "--> Upgrading " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        // Read existing field
-        IOobject ioObj
-        (
-            fieldName,
-            mesh.time().timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        tmp<fieldType> fieldOrig
-        (
-            new fieldType
-            (
-                ioObj,
-                mesh
-            )
-        );
-
-        // rename file
-        Info<< "    Backup original " << fieldName << " to "
-            << fieldName << ".old" << endl;
-        mvBak(ioObj.objectPath(), "old");
-
-
-        PtrList<fvPatchField<Type> > newPatchFields(mesh.boundary().size());
-
-        forAll(newPatchFields, patchI)
-        {
-            if (isA<wallFvPatch>(mesh.boundary()[patchI]))
-            {
-                newPatchFields.set
-                (
-                    patchI,
-                    new PatchType
-                    (
-                        mesh.boundary()[patchI],
-                        fieldOrig().dimensionedInternalField()
-                    )
-                );
-                newPatchFields[patchI] == fieldOrig().boundaryField()[patchI];
-            }
-            else
-            {
-                newPatchFields.set
-                (
-                    patchI,
-                    fieldOrig().boundaryField()[patchI].clone()
-                );
-            }
-        }
-
-        tmp<fieldType> fieldNew
-        (
-            new fieldType
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                fieldOrig().dimensions(),
-                fieldOrig().internalField(),
-                newPatchFields
-            )
-        );
-
-        Info<< "    Writing updated " << fieldName << endl;
-        fieldNew().write();
-
-        return fieldNew;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/doc/compressibleRASBoundaryConditionsDoc.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/doc/compressibleRASBoundaryConditionsDoc.H
deleted file mode 100644
index d0ef1e1af..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/doc/compressibleRASBoundaryConditionsDoc.H
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpCmpRASBoundaryConditions RAS compressible boundary conditions
-@{
-    \ingroup grpCmpRASTurbulence
-    This group contains compressible RAS turbulence model boundary conditions
-@}
-
-\defgroup grpCmpWallFunctions RAS compressible wall functions
-@{
-    \ingroup grpCmpRASBoundaryConditions
-    This group contains compressible RAS turbulence model wall functions
-@}
-
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
deleted file mode 100644
index 0d6694fa3..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ /dev/null
@@ -1,179 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulentMixingLengthDissipationRateInletFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-#include "volFields.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(0.0),
-    kName_("k")
-{
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    inletOutletFvPatchScalarField(ptf, p, iF, mapper),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookupOrDefault<word>("k", "k"))
-{
-    this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf
-)
-:
-    inletOutletFvPatchScalarField(ptf),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(ptf, iF),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    // Lookup Cmu corresponding to the turbulence model selected
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalar Cmu =
-        turbulence.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
-
-    const scalar Cmu75 = pow(Cmu, 0.75);
-
-    const fvPatchScalarField& kp =
-        patch().lookupPatchField<volScalarField, scalar>(kName_);
-
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
-
-    this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
-    this->valueFraction() = 1.0 - pos(phip);
-
-    inletOutletFvPatchScalarField::updateCoeffs();
-}
-
-
-void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
-(
-    Ostream& os
-) const
-{
-    fvPatchScalarField::write(os);
-    os.writeKeyword("mixingLength")
-        << mixingLength_ << token::END_STATEMENT << nl;
-    os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    turbulentMixingLengthDissipationRateInletFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
deleted file mode 100644
index 63aa24b8e..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ /dev/null
@@ -1,203 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-
-Group
-    grpCmpRASBoundaryConditions grpInletBoundaryConditions
-
-Description
-    This boundary condition provides a turbulence dissipation, \f$\epsilon\f$
-    (epsilon) inlet condition based on a specified mixing length.  The patch
-    values are calculated using:
-
-        \f[
-            \epsilon_p = \frac{C_{\mu}^{0.75} k^{1.5}}{L}
-        \f]
-   
-    where
-
-    \vartable
-        \epsilon_p | patch epsilon values
-        C_{\mu} | Model coefficient, set to 0.09
-        k       | turbulence kinetic energy
-        L       | length scale
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        mixingLength | Length scale [m]        | yes         |
-        phi          | flux field name         | no          | phi
-        k            | turbulence kinetic energy field name | no | k
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
-        mixingLength    0.005;
-        value           uniform 200;   // placeholder
-    }
-    \endverbatim
-
-Note
-    In the event of reverse flow, a zero-gradient condition is applied
-
-SeeAlso
-    Foam::inletOutletFvPatchField
-
-SourceFiles
-    turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleturbulentMixingLengthDissipationRateInletFvPatchField_H
-#define compressibleturbulentMixingLengthDissipationRateInletFvPatchField_H
-
-#include "inletOutletFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
- Class turbulentMixingLengthDissipationRateInletFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulentMixingLengthDissipationRateInletFvPatchScalarField
-:
-    public inletOutletFvPatchScalarField
-{
-    // Private data
-
-        //- turbulent length scale
-        scalar mixingLength_;
-
-        //- Name of the turbulent kinetic energy field
-        word kName_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::turbulentMixingLengthDissipationRateInlet");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        //  onto a new patch
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const turbulentMixingLengthDissipationRateInletFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const turbulentMixingLengthDissipationRateInletFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthDissipationRateInletFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const turbulentMixingLengthDissipationRateInletFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthDissipationRateInletFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
deleted file mode 100644
index 70017d525..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ /dev/null
@@ -1,180 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulentMixingLengthFrequencyInletFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-#include "volFields.H"
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(0.0),
-    kName_("k")
-{
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    inletOutletFvPatchScalarField(ptf, p, iF, mapper),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookupOrDefault<word>("k", "k"))
-{
-    this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
-
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf
-)
-:
-    inletOutletFvPatchScalarField(ptf),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(ptf, iF),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    // Lookup Cmu corresponding to the turbulence model selected
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalar Cmu =
-        turbulence.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
-
-    const scalar Cmu25 = pow(Cmu, 0.25);
-
-    const fvPatchScalarField& kp =
-        patch().lookupPatchField<volScalarField, scalar>(kName_);
-
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
-
-    this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
-    this->valueFraction() = 1.0 - pos(phip);
-
-    inletOutletFvPatchScalarField::updateCoeffs();
-}
-
-
-void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
-(
-    Ostream& os
-) const
-{
-    fvPatchScalarField::write(os);
-    os.writeKeyword("mixingLength")
-        << mixingLength_ << token::END_STATEMENT << nl;
-    os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    turbulentMixingLengthFrequencyInletFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
deleted file mode 100644
index cafd2d9d1..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ /dev/null
@@ -1,202 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::turbulentMixingLengthFrequencyInletFvPatchScalarField
-
-Group
-    grpCmpRASBoundaryConditions grpInletBoundaryConditions
-
-Description
-    This boundary condition provides a turbulence specific dissipation,
-    \f$\omega\f$ (omega) inlet condition based on a specified mixing length.
-    The patch values are calculated using:
-
-        \f[
-            \omega_p = \frac{k^{0.5}}{C_{\mu}^{0.25} L}
-        \f]
-   
-    where
-
-    \vartable
-        \omega_p | patch omega values
-        C_{\mu} | Model coefficient, set to 0.09
-        k       | turbulence kinetic energy
-        L       | length scale
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        mixingLength | Length scale [m]        | yes         |
-        phi          | flux field name         | no          | phi
-        k            | turbulence kinetic energy field name | no | k
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
-        mixingLength    0.005;
-        value           uniform 200;   // placeholder
-    }
-    \endverbatim
-
-Note
-    In the event of reverse flow, a zero-gradient condition is applied
-
-SeeAlso
-    Foam::inletOutletFvPatchField
-
-SourceFiles
-    turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
-#define compressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
-
-#include "inletOutletFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-    Class turbulentMixingLengthFrequencyInletFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulentMixingLengthFrequencyInletFvPatchScalarField
-:
-    public inletOutletFvPatchScalarField
-{
-    // Private data
-
-        //- Turbulent length scale
-        scalar mixingLength_;
-
-        //- Name of the turbulent kinetic energy field
-        word kName_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::turbulentMixingLengthFrequencyInlet");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  turbulentMixingLengthFrequencyInletFvPatchScalarField
-        //  onto a new patch
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const turbulentMixingLengthFrequencyInletFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const turbulentMixingLengthFrequencyInletFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthFrequencyInletFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const turbulentMixingLengthFrequencyInletFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthFrequencyInletFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 347993c1f..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,196 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "epsilonLowReWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-scalar epsilonLowReWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-void epsilonLowReWallFunctionFvPatchScalarField::calculate
-(
-    const turbulenceModel& turbulence,
-    const List<scalar>& cornerWeights,
-    const fvPatch& patch,
-    scalarField& G,
-    scalarField& epsilon
-)
-{
-    const label patchI = patch.index();
-
-    const scalarField& y = turbulence.y()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-    const scalar Cmu75 = pow(Cmu_, 0.75);
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tmu = turbulence.mu();
-    const scalarField& muw = tmu().boundaryField()[patchI];
-
-    const tmp<volScalarField> tmut = turbulence.mut();
-    const volScalarField& mut = tmut();
-    const scalarField& mutw = mut.boundaryField()[patchI];
-
-    const scalarField& rhow = turbulence.rho().boundaryField()[patchI];
-
-    const fvPatchVectorField& Uw = turbulence.U().boundaryField()[patchI];
-
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    // Set epsilon and G
-    forAll(mutw, faceI)
-    {
-        label cellI = patch.faceCells()[faceI];
-
-        scalar yPlus = Cmu25*sqrt(k[cellI])*y[faceI]/(muw[faceI]/rhow[faceI]);
-
-        scalar w = cornerWeights[faceI];
-
-        if (yPlus > yPlusLam_)
-        {
-            epsilon[cellI] = w*Cmu75*pow(k[cellI], 1.5)/(kappa_*y[faceI]);
-        }
-        else
-        {
-            epsilon[cellI] =
-                w*2.0*k[cellI]*muw[faceI]/rhow[faceI]/sqr(y[faceI]);
-        }
-
-        G[cellI] =
-            w
-           *(mutw[faceI] + muw[faceI])
-           *magGradUw[faceI]
-           *Cmu25*sqrt(k[cellI])
-           /(kappa_*y[faceI]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    epsilonWallFunctionFvPatchScalarField(p, iF),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const epsilonLowReWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    epsilonWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    yPlusLam_(ptf.yPlusLam_)
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    epsilonWallFunctionFvPatchScalarField(p, iF, dict),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const epsilonLowReWallFunctionFvPatchScalarField& ewfpsf
-)
-:
-    epsilonWallFunctionFvPatchScalarField(ewfpsf),
-    yPlusLam_(ewfpsf.yPlusLam_)
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const epsilonLowReWallFunctionFvPatchScalarField& ewfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    epsilonWallFunctionFvPatchScalarField(ewfpsf, iF),
-    yPlusLam_(ewfpsf.yPlusLam_)
-{}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    epsilonLowReWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H
deleted file mode 100644
index bac27237c..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,190 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 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/>.
-
-Class
-    Foam::compressible::epsilonLowReWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulence dissipation wall function
-    condition for low- and high-Reynolds number turbulent flow cases.
-
-    The condition can be applied to wall boundaries, whereby it inserts near
-    wall epsilon values directly into the epsilon equation to act as a
-    constraint.
-
-    The model operates in two modes, based on the computed laminar-to-turbulent
-    switch-over y+ value derived from kappa and E.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            epsilonLowReWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::epsilonWallFunctionFvPatchScalarField
-
-SourceFiles
-    epsilonLowReWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef epsilonLowReWallFunctionFvPatchScalarField_H
-#define epsilonLowReWallFunctionFvPatchScalarField_H
-
-#include "epsilonWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-           Class epsilonLowReWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class epsilonLowReWallFunctionFvPatchScalarField
-:
-    public epsilonWallFunctionFvPatchScalarField
-{
-
-protected:
-
-    // Protected data
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        scalar yPlusLam(const scalar kappa, const scalar E);
-
-        //- Calculate the epsilon and G
-        virtual void calculate
-        (
-            const turbulenceModel& turbulence,
-            const List<scalar>& cornerWeights,
-            const fvPatch& patch,
-            scalarField& G,
-            scalarField& epsilon
-        );
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::epsilonLowReWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  epsilonLowReWallFunctionFvPatchScalarField
-        //  onto a new patch
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const epsilonLowReWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const epsilonLowReWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const epsilonLowReWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 1bf17b6fa..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,586 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "epsilonWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "fvMatrix.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-scalar epsilonWallFunctionFvPatchScalarField::tolerance_ = 1e-5;
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void epsilonWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::setMaster()
-{
-    if (master_ != -1)
-    {
-        return;
-    }
-
-    const volScalarField& epsilon =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
-
-    label master = -1;
-    forAll(bf, patchI)
-    {
-        if (isA<epsilonWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            epsilonWallFunctionFvPatchScalarField& epf = epsilonPatch(patchI);
-
-            if (master == -1)
-            {
-                master = patchI;
-            }
-
-            epf.master() = master;
-        }
-    }
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::createAveragingWeights()
-{
-    const volScalarField& epsilon =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
-
-    const fvMesh& mesh = epsilon.mesh();
-
-    if (initialised_ && !mesh.changing())
-    {
-        return;
-    }
-
-    volScalarField weights
-    (
-        IOobject
-        (
-            "weights",
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false // do not register
-        ),
-        mesh,
-        dimensionedScalar("zero", dimless, 0.0)
-    );
-
-    DynamicList<label> epsilonPatches(bf.size());
-    forAll(bf, patchI)
-    {
-        if (isA<epsilonWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            epsilonPatches.append(patchI);
-
-            const labelUList& faceCells = bf[patchI].patch().faceCells();
-            forAll(faceCells, i)
-            {
-                label cellI = faceCells[i];
-                weights[cellI]++;
-            }
-        }
-    }
-
-    cornerWeights_.setSize(bf.size());
-    forAll(epsilonPatches, i)
-    {
-        label patchI = epsilonPatches[i];
-        const fvPatchScalarField& wf = weights.boundaryField()[patchI];
-        cornerWeights_[patchI] = 1.0/wf.patchInternalField();
-    }
-
-    G_.setSize(dimensionedInternalField().size(), 0.0);
-    epsilon_.setSize(dimensionedInternalField().size(), 0.0);
-
-    initialised_ = true;
-}
-
-
-epsilonWallFunctionFvPatchScalarField&
-epsilonWallFunctionFvPatchScalarField::epsilonPatch(const label patchI)
-{
-    const volScalarField& epsilon =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
-
-    const epsilonWallFunctionFvPatchScalarField& epf =
-        refCast<const epsilonWallFunctionFvPatchScalarField>(bf[patchI]);
-
-    return const_cast<epsilonWallFunctionFvPatchScalarField&>(epf);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::calculateTurbulenceFields
-(
-    const turbulenceModel& turbulence,
-    scalarField& G0,
-    scalarField& epsilon0
-)
-{
-    // accumulate all of the G and epsilon contributions
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            epsilonWallFunctionFvPatchScalarField& epf = epsilonPatch(patchI);
-
-            const List<scalar>& w = cornerWeights_[patchI];
-
-            epf.calculate(turbulence, w, epf.patch(), G0, epsilon0);
-        }
-    }
-
-    // apply zero-gradient condition for epsilon
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            epsilonWallFunctionFvPatchScalarField& epf = epsilonPatch(patchI);
-
-            epf == scalarField(epsilon0, epf.patch().faceCells());
-        }
-    }
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::calculate
-(
-    const turbulenceModel& turbulence,
-    const List<scalar>& cornerWeights,
-    const fvPatch& patch,
-    scalarField& G,
-    scalarField& epsilon
-)
-{
-    const label patchI = patch.index();
-
-    const scalarField& y = turbulence.y()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-    const scalar Cmu75 = pow(Cmu_, 0.75);
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tmu = turbulence.mu();
-    const scalarField& muw = tmu().boundaryField()[patchI];
-
-    const tmp<volScalarField> tmut = turbulence.mut();
-    const volScalarField& mut = tmut();
-    const scalarField& mutw = mut.boundaryField()[patchI];
-
-    const fvPatchVectorField& Uw = turbulence.U().boundaryField()[patchI];
-
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    // Set epsilon and G
-    forAll(mutw, faceI)
-    {
-        label cellI = patch.faceCells()[faceI];
-
-        scalar w = cornerWeights[faceI];
-
-        epsilon[cellI] += w*Cmu75*pow(k[cellI], 1.5)/(kappa_*y[faceI]);
-
-        G[cellI] +=
-            w
-           *(mutw[faceI] + muw[faceI])
-           *magGradUw[faceI]
-           *Cmu25*sqrt(k[cellI])
-           /(kappa_*y[faceI]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const epsilonWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-
-    // apply zero-gradient condition on start-up
-    this->operator==(patchInternalField());
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const epsilonWallFunctionFvPatchScalarField& ewfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(ewfpsf),
-    Cmu_(ewfpsf.Cmu_),
-    kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const epsilonWallFunctionFvPatchScalarField& ewfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(ewfpsf, iF),
-    Cmu_(ewfpsf.Cmu_),
-    kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-scalarField& epsilonWallFunctionFvPatchScalarField::G(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            G_ = 0.0;
-        }
-
-        return G_;
-    }
-
-    return epsilonPatch(master_).G();
-}
-
-
-scalarField& epsilonWallFunctionFvPatchScalarField::epsilon(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            epsilon_ = 0.0;
-        }
-
-        return epsilon_;
-    }
-
-    return epsilonPatch(master_).epsilon(init);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), epsilon(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& epsilon0 = this->epsilon();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& epsilon = const_cast<FieldType&>(dimensionedInternalField());
-
-    forAll(*this, faceI)
-    {
-        label cellI = patch().faceCells()[faceI];
-
-        G[cellI] = G0[cellI];
-        epsilon[cellI] = epsilon0[cellI];
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::updateCoeffs
-(
-    const scalarField& weights
-)
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), epsilon(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& epsilon0 = this->epsilon();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& epsilon = const_cast<FieldType&>(dimensionedInternalField());
-
-    scalarField& epsilonf = *this;
-
-    // only set the values if the weights are > tolerance
-    forAll(weights, faceI)
-    {
-        scalar w = weights[faceI];
-
-        if (w > tolerance_)
-        {
-            label cellI = patch().faceCells()[faceI];
-
-            G[cellI] = (1.0 - w)*G[cellI] + w*G0[cellI];
-            epsilon[cellI] = (1.0 - w)*epsilon[cellI] + w*epsilon0[cellI];
-            epsilonf[faceI] = epsilon[cellI];
-        }
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    matrix.setValues(patch().faceCells(), patchInternalField());
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix,
-    const Field<scalar>& weights
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    // filter weights so that we only apply the constraint where the
-    // weight > SMALL
-    DynamicList<label> constraintCells(weights.size());
-    DynamicList<scalar> constraintEpsilon(weights.size());
-    const labelUList& faceCells = patch().faceCells();
-
-    const DimensionedField<scalar, volMesh>& epsilon =
-        dimensionedInternalField();
-
-    label nConstrainedCells = 0;
-
-
-    forAll(weights, faceI)
-    {
-        // only set the values if the weights are > tolerance
-        if (weights[faceI] > tolerance_)
-        {
-            nConstrainedCells++;
-
-            label cellI = faceCells[faceI];
-
-            constraintCells.append(cellI);
-            constraintEpsilon.append(epsilon[cellI]);
-        }
-    }
-
-    if (debug)
-    {
-        Pout<< "Patch: " << patch().name()
-            << ": number of constrained cells = " << nConstrainedCells
-            << " out of " << patch().size()
-            << endl;
-    }
-
-    matrix.setValues
-    (
-        constraintCells,
-        scalarField(constraintEpsilon.xfer())
-    );
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    epsilonWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
deleted file mode 100644
index b02431321..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,292 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::compressible::epsilonWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulence dissipation wall function
-    condition for high Reynolds number, turbulent flow cases.
-
-    The condition can be applied to wall boundaries, whereby it
-    - calculates \c epsilon and \c G
-    - inserts near wall epsilon values directly into the epsilon equation
-        to act as a constraint
-
-    where
-
-    \vartable
-        epsilon | turblence dissipation field
-        G       | turblence generation field
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            compressible::epsilonWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedInternalValueFvPatchField
-
-SourceFiles
-    epsilonWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleEpsilonWallFunctionFvPatchScalarField_H
-#define compressibleEpsilonWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-class turbulenceModel;
-
-/*---------------------------------------------------------------------------*\
-           Class epsilonWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class epsilonWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Tolerance used in weighted calculations
-        static scalar tolerance_;
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Local copy of turbulence G field
-        scalarField G_;
-
-        //- Local copy of turbulence epsilon field
-        scalarField epsilon_;
-
-        //- Initialised flag
-        bool initialised_;
-
-        //- Master patch ID
-        label master_;
-
-        //- List of averaging corner weights
-        List<List<scalar> > cornerWeights_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-        //- Set the master patch - master is responsible for updating all
-        //  wall function patches
-        virtual void setMaster();
-
-        //- Create the averaging weights for cells which are bounded by
-        //  multiple wall function faces
-        virtual void createAveragingWeights();
-
-        //- Helper function to return non-const access to an epsilon patch
-        virtual epsilonWallFunctionFvPatchScalarField& epsilonPatch
-        (
-            const label patchI
-        );
-
-        //- Main driver to calculate the turbulence fields
-        virtual void calculateTurbulenceFields
-        (
-            const turbulenceModel& turbulence,
-            scalarField& G0,
-            scalarField& epsilon0
-        );
-
-        //- Calculate the epsilon and G
-        virtual void calculate
-        (
-            const turbulenceModel& turbulence,
-            const List<scalar>& cornerWeights,
-            const fvPatch& patch,
-            scalarField& G,
-            scalarField& epsilon
-        );
-
-        //- Return non-const access to the master patch ID
-        virtual label& master()
-        {
-            return master_;
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::epsilonWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  epsilonWallFunctionFvPatchScalarField
-        //  onto a new patch
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const epsilonWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const epsilonWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const epsilonWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    //- Destructor
-    virtual ~epsilonWallFunctionFvPatchScalarField()
-    {}
-
-
-    // Member functions
-
-        // Access
-
-            //- Return non-const access to the master's G field
-            scalarField& G(bool init = false);
-
-            //- Return non-const access to the master's epsilon field
-            scalarField& epsilon(bool init = false);
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs(const scalarField& weights);
-
-            //- Manipulate matrix
-            virtual void manipulateMatrix(fvMatrix<scalar>& matrix);
-
-            //- Manipulate matrix with given weights
-            virtual void manipulateMatrix
-            (
-                fvMatrix<scalar>& matrix,
-                const scalarField& weights
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 60ad82717..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,263 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fWallFunctionFvPatchScalarField.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "v2f.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void fWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("fWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void fWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-}
-
-
-scalar fWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField
-(
-    const fWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    yPlusLam_(ptf.yPlusLam_)
-{
-    checkType();
-}
-
-
-fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField
-(
-    const fWallFunctionFvPatchScalarField& v2wfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(v2wfpsf),
-    Cmu_(v2wfpsf.Cmu_),
-    kappa_(v2wfpsf.kappa_),
-    E_(v2wfpsf.E_),
-    yPlusLam_(v2wfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField
-(
-    const fWallFunctionFvPatchScalarField& v2wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(v2wfpsf, iF),
-    Cmu_(v2wfpsf.Cmu_),
-    kappa_(v2wfpsf.kappa_),
-    E_(v2wfpsf.E_),
-    yPlusLam_(v2wfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void fWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const v2f& v2fModel = refCast<const v2f>(turbulence);
-
-    const scalarField& y = v2fModel.y()[patchI];
-
-    const tmp<volScalarField> tk = v2fModel.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tepsilon = v2fModel.epsilon();
-    const volScalarField& epsilon = tepsilon();
-
-    const tmp<volScalarField> tv2 = v2fModel.v2();
-    const volScalarField& v2 = tv2();
-
-    const tmp<volScalarField> tmu = v2fModel.mu();
-    const scalarField& muw = tmu().boundaryField()[patchI];
-
-    const scalarField& rhow = v2fModel.rho().boundaryField()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    scalarField& f = *this;
-
-    // Set f wall values
-    forAll(f, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uTau = Cmu25*sqrt(k[faceCellI]);
-
-        scalar yPlus = uTau*y[faceI]/(muw[faceI]/rhow[faceI]);
-
-        if (yPlus > yPlusLam_)
-        {
-            scalar N = 6.0;
-            scalar v2c = v2[faceCellI];
-            scalar epsc = epsilon[faceCellI];
-            scalar kc = k[faceCellI];
-
-            f[faceI] = N*v2c*epsc/(sqr(kc) + ROOTVSMALL);
-            f[faceI] /= sqr(uTau) + ROOTVSMALL;
-        }
-        else
-        {
-            f[faceI] = 0.0;
-        }
-    }
-
-    fixedValueFvPatchField<scalar>::updateCoeffs();
-
-    // TODO: perform averaging for cells sharing more than one boundary face
-}
-
-
-void fWallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes commsType
-)
-{
-    fixedValueFvPatchField<scalar>::evaluate(commsType);
-}
-
-
-void fWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    writeLocalEntries(os);
-    fixedValueFvPatchField<scalar>::write(os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    fWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 6163d05ad..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,209 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 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/>.
-
-Class
-    Foam::compressible::RASModels::fWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulence damping function, f, wall
-    function condition for low- and high Reynolds number, turbulent flow cases
-
-    The model operates in two modes, based on the computed laminar-to-turbulent
-    switch-over y+ value derived from kappa and E.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            fWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedValueFvPatchField
-
-SourceFiles
-    fWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fWallFunctionFvPatchScalarField_H
-#define fWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-               Class fWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class fWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        scalar yPlusLam(const scalar kappa, const scalar E);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::fWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        fWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        fWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given fWallFunctionFvPatchScalarField
-        //  onto a new patch
-        fWallFunctionFvPatchScalarField
-        (
-            const fWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        fWallFunctionFvPatchScalarField
-        (
-            const fWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new fWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        fWallFunctionFvPatchScalarField
-        (
-            const fWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new fWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Evaluate the patchField
-            virtual void evaluate(const Pstream::commsTypes);
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 72a987b68..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,255 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kLowReWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void kLowReWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("kLowReWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-scalar kLowReWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    Ceps2_(1.9),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const kLowReWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    Ceps2_(ptf.Ceps2_),
-    yPlusLam_(ptf.yPlusLam_)
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    Ceps2_(dict.lookupOrDefault<scalar>("Ceps2", 1.9)),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const kLowReWallFunctionFvPatchScalarField& kwfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(kwfpsf),
-    Cmu_(kwfpsf.Cmu_),
-    kappa_(kwfpsf.kappa_),
-    E_(kwfpsf.E_),
-    Ceps2_(kwfpsf.Ceps2_),
-    yPlusLam_(kwfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const kLowReWallFunctionFvPatchScalarField& kwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(kwfpsf, iF),
-    Cmu_(kwfpsf.Cmu_),
-    kappa_(kwfpsf.kappa_),
-    E_(kwfpsf.E_),
-    Ceps2_(kwfpsf.Ceps2_),
-    yPlusLam_(kwfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void kLowReWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbulence.y()[patchI];
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tmu = turbulence.mu();
-    const scalarField& muw = tmu().boundaryField()[patchI];
-
-    const scalarField& rhow = turbulence.rho().boundaryField()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    scalarField& kw = *this;
-
-    // Set k wall values
-    forAll(kw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uTau = Cmu25*sqrt(k[faceCellI]);
-
-        scalar yPlus = uTau*y[faceI]/(muw[faceI]/rhow[faceI]);
-
-        if (yPlus > yPlusLam_)
-        {
-            scalar Ck = -0.416;
-            scalar Bk = 8.366;
-            kw[faceI] = Ck/kappa_*log(yPlus) + Bk;
-        }
-        else
-        {
-            scalar C = 11.0;
-            scalar Cf = (1.0/sqr(yPlus + C) + 2.0*yPlus/pow3(C) - 1.0/sqr(C));
-            kw[faceI] = 2400.0/sqr(Ceps2_)*Cf;
-        }
-
-        kw[faceI] *= sqr(uTau);
-    }
-
-    fixedValueFvPatchField<scalar>::updateCoeffs();
-
-    // TODO: perform averaging for cells sharing more than one boundary face
-}
-
-
-void kLowReWallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes commsType
-)
-{
-    fixedValueFvPatchField<scalar>::evaluate(commsType);
-}
-
-
-void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    kLowReWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 511bc19b6..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,207 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-Class
-    Foam::compressible::kLowReWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulence kinetic energy wall function
-    condition for low- and high-Reynolds number turbulent flow cases.
-
-    The model operates in two modes, based on the computed laminar-to-turbulent
-    switch-over y+ value derived from kappa and E.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-        Ceps2        | model coefficient       | no          | 1.9
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            kLowReWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedValueFvPatchField
-
-SourceFiles
-    kLowReWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kLowReWallFunctionFvPatchScalarField_H
-#define kLowReWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-            Class kLowReWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class kLowReWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Ceps2 coefficient
-        scalar Ceps2_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        scalar yPlusLam(const scalar kappa, const scalar E);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::kLowReWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given kLowReWallFunctionFvPatchScalarField
-        //  onto a new patch
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const kLowReWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const kLowReWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new kLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const kLowReWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new kLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Evaluate the patchField
-            virtual void evaluate(const Pstream::commsTypes);
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
deleted file mode 100644
index 0d0fc6138..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kqRWallFunctionFvPatchField.H"
-#include "fvPatchFieldMapper.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void kqRWallFunctionFvPatchField<Type>::checkType()
-{
-    if (!isA<wallFvPatch>(this->patch()))
-    {
-        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << this->patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << this->patch().type()
-            << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    zeroGradientFvPatchField<Type>(p, iF)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const kqRWallFunctionFvPatchField& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    zeroGradientFvPatchField<Type>(ptf, p, iF, mapper)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    zeroGradientFvPatchField<Type>(p, iF, dict)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const kqRWallFunctionFvPatchField& tkqrwfpf
-)
-:
-    zeroGradientFvPatchField<Type>(tkqrwfpf)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const kqRWallFunctionFvPatchField& tkqrwfpf,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    zeroGradientFvPatchField<Type>(tkqrwfpf, iF)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void kqRWallFunctionFvPatchField<Type>::evaluate
-(
-    const Pstream::commsTypes commsType
-)
-{
-    zeroGradientFvPatchField<Type>::evaluate(commsType);
-}
-
-
-template<class Type>
-void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
-{
-    zeroGradientFvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
deleted file mode 100644
index e96076fbc..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ /dev/null
@@ -1,182 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::kqRWallFunctionFvPatchField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition is applied to turbulence \c k, \c q, and \c R
-    when using wall functions, and simply enforces a zero-gradient condition.
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            compressible::kqRWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::zeroGradientFvPatchField
-
-SourceFiles
-    kqRWallFunctionFvPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressiblekqRWallFunctionFvPatchField_H
-#define compressiblekqRWallFunctionFvPatchField_H
-
-#include "zeroGradientFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-                Class kqRWallFunctionFvPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class kqRWallFunctionFvPatchField
-:
-    public zeroGradientFvPatchField<Type>
-{
-
-    // Private Member Functions
-
-        //- Check the type of the patch
-        void checkType();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::kqRWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        kqRWallFunctionFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        kqRWallFunctionFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        // kqRWallFunctionFvPatchField
-        //  onto a new patch
-        kqRWallFunctionFvPatchField
-        (
-            const kqRWallFunctionFvPatchField&,
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        kqRWallFunctionFvPatchField
-        (
-            const kqRWallFunctionFvPatchField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new kqRWallFunctionFvPatchField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        kqRWallFunctionFvPatchField
-        (
-            const kqRWallFunctionFvPatchField&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
-        (
-            const DimensionedField<Type, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new kqRWallFunctionFvPatchField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Evaluate the patchField
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "kqRWallFunctionFvPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
deleted file mode 100644
index 249b99ba3..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kqRWallFunctionFvPatchFields.H"
-#include "fvPatchFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(kqRWallFunction);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 269f9698a..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,133 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutLowReWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> mutLowReWallFunctionFvPatchScalarField::calcMut() const
-{
-    return tmp<scalarField>(new scalarField(patch().size(), 0.0));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
-(
-    const mutLowReWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
-(
-    const mutLowReWallFunctionFvPatchScalarField& mlrwfpsf
-)
-:
-    mutWallFunctionFvPatchScalarField(mlrwfpsf)
-{}
-
-
-mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
-(
-    const mutLowReWallFunctionFvPatchScalarField& mlrwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(mlrwfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> mutLowReWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const scalarField nuw
-    (
-        turbModel.mu().boundaryField()[patchi]
-       /turbModel.rho().boundaryField()[patchi]
-    );
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-
-    return y*sqrt(nuw*mag(Uw.snGrad()))/nuw;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    mutLowReWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 75f751288..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,168 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::mutLowReWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition for use
-    with low Reynolds number models.  It sets \c nut to zero, and provides an
-    access function to calculate y+.
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutLowReWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::compressible::mutWallFunctionFvPatchScalarField
-
-SourceFiles
-    mutLowReWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutLowReWallFunctionFvPatchScalarField_H
-#define compressibleMutLowReWallFunctionFvPatchScalarField_H
-
-#include "mutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-          Class mutLowReWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutLowReWallFunctionFvPatchScalarField
-:
-    public mutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Private Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutLowReWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutLowReWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutLowReWallFunctionFvPatchScalarField
-        (
-            const mutLowReWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutLowReWallFunctionFvPatchScalarField
-        (
-            const mutLowReWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        mutLowReWallFunctionFvPatchScalarField
-        (
-            const mutLowReWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 5591904c9..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,315 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutURoughWallFunctionFvPatchScalarField.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> mutURoughWallFunctionFvPatchScalarField::calcYPlus
-(
-    const scalarField& magUp
-) const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalarField& y = turbModel.y()[patchi];
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-    const fvPatchScalarField& rho = turbModel.rho().boundaryField()[patchi];
-
-    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
-    scalarField& yPlus = tyPlus();
-
-    if (roughnessHeight_ > 0.0)
-    {
-        // Rough Walls
-        const scalar c_1 = 1/(90 - 2.25) + roughnessConstant_;
-        static const scalar c_2 = 2.25/(90 - 2.25);
-        static const scalar c_3 = 2.0*atan(1.0)/log(90/2.25);
-        static const scalar c_4 = c_3*log(2.25);
-
-        //if (KsPlusBasedOnYPlus_)
-        {
-            // If KsPlus is based on YPlus the extra term added to the law
-            // of the wall will depend on yPlus
-            forAll(yPlus, facei)
-            {
-                const scalar Re = rho[facei]*magUp[facei]*y[facei]/muw[facei];
-                const scalar kappaRe = kappa_*Re;
-
-                scalar yp = yPlusLam_;
-                const scalar ryPlusLam = 1.0/yp;
-
-                int iter = 0;
-                scalar yPlusLast = 0.0;
-                scalar dKsPlusdYPlus = roughnessHeight_/y[facei];
-
-                // Enforce the roughnessHeight to be less than the distance to
-                // the first cell centre.
-                if (dKsPlusdYPlus > 1)
-                {
-                    dKsPlusdYPlus = 1;
-                }
-
-                // Additional tuning parameter (fudge factor) - nominally = 1
-                dKsPlusdYPlus *= roughnessFactor_;
-
-                do
-                {
-                    yPlusLast = yp;
-
-                    // The non-dimensional roughness height
-                    scalar KsPlus = yp*dKsPlusdYPlus;
-
-                    // The extra term in the law-of-the-wall
-                    scalar G = 0.0;
-
-                    scalar yPlusGPrime = 0.0;
-
-                    if (KsPlus >= 90)
-                    {
-                        const scalar t_1 = 1 + roughnessConstant_*KsPlus;
-                        G = log(t_1);
-                        yPlusGPrime = roughnessConstant_*KsPlus/t_1;
-                    }
-                    else if (KsPlus > 2.25)
-                    {
-                        const scalar t_1 = c_1*KsPlus - c_2;
-                        const scalar t_2 = c_3*log(KsPlus) - c_4;
-                        const scalar sint_2 = sin(t_2);
-                        const scalar logt_1 = log(t_1);
-                        G = logt_1*sint_2;
-                        yPlusGPrime =
-                            (c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
-                    }
-
-                    scalar denom = 1.0 + log(E_*yp) - G - yPlusGPrime;
-                    if (mag(denom) > VSMALL)
-                    {
-                        yp = (kappaRe + yp*(1 - yPlusGPrime))/denom;
-                    }
-
-                } while
-                (
-                    mag(ryPlusLam*(yp - yPlusLast)) > 0.0001
-                 && ++iter < 10
-                 && yp > VSMALL
-                );
-
-                yPlus[facei] = max(0.0, yp);
-            }
-        }
-    }
-    else
-    {
-        // Smooth Walls
-        forAll(yPlus, facei)
-        {
-            const scalar Re = rho[facei]*magUp[facei]*y[facei]/muw[facei];
-            const scalar kappaRe = kappa_*Re;
-
-            scalar yp = yPlusLam_;
-            const scalar ryPlusLam = 1.0/yp;
-
-            int iter = 0;
-            scalar yPlusLast = 0.0;
-
-            do
-            {
-                yPlusLast = yp;
-                yp = (kappaRe + yp)/(1.0 + log(E_*yp));
-
-            } while
-            (
-                mag(ryPlusLam*(yp - yPlusLast)) > 0.0001
-             && ++iter < 10
-            );
-
-            yPlus[facei] = max(0.0, yp);
-        }
-    }
-
-    return tyPlus;
-}
-
-
-tmp<scalarField> mutURoughWallFunctionFvPatchScalarField::calcMut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-    const fvPatchScalarField& rho = turbModel.rho().boundaryField()[patchi];
-
-    scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    tmp<scalarField> tyPlus = calcYPlus(magUp);
-    scalarField& yPlus = tyPlus();
-
-    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
-    scalarField& mutw = tmutw();
-
-    forAll(yPlus, facei)
-    {
-        if (yPlus[facei] > yPlusLam_)
-        {
-            const scalar Re =
-                rho[facei]*magUp[facei]*y[facei]/muw[facei] + ROOTVSMALL;
-            mutw[facei] = muw[facei]*(sqr(yPlus[facei])/Re - 1);
-        }
-    }
-
-    return tmutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF),
-    roughnessHeight_(pTraits<scalar>::zero),
-    roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFactor_(pTraits<scalar>::zero)
-{}
-
-
-mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
-(
-    const mutURoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    roughnessHeight_(ptf.roughnessHeight_),
-    roughnessConstant_(ptf.roughnessConstant_),
-    roughnessFactor_(ptf.roughnessFactor_)
-{}
-
-
-mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF, dict),
-    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
-    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFactor_(readScalar(dict.lookup("roughnessFactor")))
-{}
-
-
-mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
-(
-    const mutURoughWallFunctionFvPatchScalarField& rwfpsf
-)
-:
-    mutWallFunctionFvPatchScalarField(rwfpsf),
-    roughnessHeight_(rwfpsf.roughnessHeight_),
-    roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFactor_(rwfpsf.roughnessFactor_)
-{}
-
-
-mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
-(
-    const mutURoughWallFunctionFvPatchScalarField& rwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(rwfpsf, iF),
-    roughnessHeight_(rwfpsf.roughnessHeight_),
-    roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFactor_(rwfpsf.roughnessFactor_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> mutURoughWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    return calcYPlus(magUp);
-}
-
-
-void mutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchScalarField::write(os);
-    writeLocalEntries(os);
-    os.writeKeyword("roughnessHeight")
-        << roughnessHeight_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessConstant")
-        << roughnessConstant_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessFactor")
-        << roughnessFactor_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    mutURoughWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H
deleted file mode 100644
index ea1aaa184..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,240 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-Class
-    Foam::compressible::mutURoughWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition when
-    using wall functions for rough walls, based on velocity.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        roughnessHeight | roughness height     | yes         |
-        roughnessConstant | roughness constanr | yes         |
-        roughnessFactor | scaling factor       | yes         |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutURoughWallFunction;
-        roughnessHeight 1e-5;
-        roughnessConstant 0.5;
-        roughnessFactor 1;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::compressible::mutWallFunctionFvPatchScalarField
-
-SourceFiles
-    mutURoughWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutURoughWallFunctionFvPatchScalarField_H
-#define compressibleMutURoughWallFunctionFvPatchScalarField_H
-
-#include "mutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-          Class mutURoughWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutURoughWallFunctionFvPatchScalarField
-:
-    public mutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        // Roughness parameters
-
-            //- Height
-            scalar roughnessHeight_;
-
-            //- Constant
-            scalar roughnessConstant_;
-
-            //- Scale factor
-            scalar roughnessFactor_;
-
-
-    // Protected Member Functions
-
-        //- Calculate yPLus
-        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutURoughWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutURoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutURoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutURoughWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutURoughWallFunctionFvPatchScalarField
-        (
-            const mutURoughWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutURoughWallFunctionFvPatchScalarField
-        (
-            const mutURoughWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutURoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        mutURoughWallFunctionFvPatchScalarField
-        (
-            const mutURoughWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutURoughWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Access
-
-            //- Return the roughness height scale
-            scalar roughnessHeight() const
-            {
-                return roughnessHeight_;
-            }
-
-            //- Return reference to the roughness height to allow adjustment
-            scalar& roughnessHeight()
-            {
-                return roughnessHeight_;
-            }
-
-            //- Return the roughness constant scale
-            scalar roughnessConstant() const
-            {
-                return roughnessConstant_;
-            }
-
-            //- Return reference to the roughness constant to allow adjustment
-            scalar& roughnessConstant()
-            {
-                return roughnessConstant_;
-            }
-
-            //- Return the roughness scale factor
-            scalar roughnessFactor() const
-            {
-                return roughnessFactor_;
-            }
-
-            //- Return reference to the roughness scale factor to allow
-            //  adjustment
-            scalar& roughnessFactor()
-            {
-                return roughnessFactor_;
-            }
-
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 64bb1238e..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,223 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutUSpaldingWallFunctionFvPatchScalarField.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> mutUSpaldingWallFunctionFvPatchScalarField::calcUTau
-(
-    const scalarField& magGradU
-) const
-{
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalarField& y = turbModel.y()[patch().index()];
-
-    const fvPatchVectorField& Uw =
-        turbModel.U().boundaryField()[patch().index()];
-
-    scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    const fvPatchScalarField& rhow =
-        turbModel.rho().boundaryField()[patch().index()];
-
-    const fvPatchScalarField& muw =
-        turbModel.mu().boundaryField()[patch().index()];
-    const scalarField& mutw = *this;
-
-    tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
-    scalarField& uTau = tuTau();
-
-    forAll(mutw, faceI)
-    {
-        scalar ut =
-            sqrt((mutw[faceI] + muw[faceI])*magGradU[faceI]/rhow[faceI]);
-
-        if (ut > ROOTVSMALL)
-        {
-            int iter = 0;
-            scalar err = GREAT;
-
-            do
-            {
-                scalar kUu = min(kappa_*magUp[faceI]/ut, 50);
-                scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
-
-                scalar f =
-                    - ut*y[faceI]/(muw[faceI]/rhow[faceI])
-                    + magUp[faceI]/ut
-                    + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
-
-                scalar df =
-                    y[faceI]/(muw[faceI]/rhow[faceI])
-                  + magUp[faceI]/sqr(ut)
-                  + 1/E_*kUu*fkUu/ut;
-
-                scalar uTauNew = ut + f/df;
-                err = mag((ut - uTauNew)/ut);
-                ut = uTauNew;
-
-            } while (ut > ROOTVSMALL && err > 0.01 && ++iter < 10);
-
-            uTau[faceI] = max(0.0, ut);
-        }
-    }
-
-    return tuTau;
-}
-
-
-tmp<scalarField> mutUSpaldingWallFunctionFvPatchScalarField::calcMut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magGradU(mag(Uw.snGrad()));
-    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-
-    return max
-    (
-        scalar(0),
-        rhow*sqr(calcUTau(magGradU))/(magGradU + ROOTVSMALL) - muw
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutUSpaldingWallFunctionFvPatchScalarField::
-mutUSpaldingWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-mutUSpaldingWallFunctionFvPatchScalarField::
-mutUSpaldingWallFunctionFvPatchScalarField
-(
-    const mutUSpaldingWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-mutUSpaldingWallFunctionFvPatchScalarField::
-mutUSpaldingWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-mutUSpaldingWallFunctionFvPatchScalarField::
-mutUSpaldingWallFunctionFvPatchScalarField
-(
-    const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    mutWallFunctionFvPatchScalarField(wfpsf)
-{}
-
-
-mutUSpaldingWallFunctionFvPatchScalarField::
-mutUSpaldingWallFunctionFvPatchScalarField
-(
-    const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(wfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> mutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-
-    return y*calcUTau(mag(Uw.snGrad()))/(muw/rhow);
-}
-
-
-void mutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    mutUSpaldingWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H
deleted file mode 100644
index a0322dbeb..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,190 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::mutUSpaldingWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition when
-    using wall functions for rough walls, based on velocity,  using  Spalding's
-    law to give a continuous nut profile to the wall (y+ = 0)
-
-        \f[
-            y^+ = u^+ + \frac{1}{E} \left[exp(\kappa u^+) - 1 - \kappa u^+\,
-                - 0.5 (\kappa u^+)^2 - \frac{1}{6} (\kappa u^+)^3\right]
-        \f]
-
-    where
-    \vartable
-        y^+     | non-dimensional position
-        u^+     | non-dimensional velocity
-        \kappa  | Von Karman constant
-    \endvartable
-
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutUSpaldingWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::compressible::mutWallFunctionFvPatchScalarField
-
-SourceFiles
-    mutUSpaldingWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutUSpaldingWallFunctionFvPatchScalarField_H
-#define compressibleMutUSpaldingWallFunctionFvPatchScalarField_H
-
-#include "mutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-        Class mutUSpaldingWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutUSpaldingWallFunctionFvPatchScalarField
-:
-    public mutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
-
-        //- Calculate the friction velocity
-        virtual tmp<scalarField> calcUTau(const scalarField& magGradU) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutUSpaldingWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutUSpaldingWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const mutUSpaldingWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const mutUSpaldingWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutUSpaldingWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        mutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const mutUSpaldingWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutUSpaldingWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 3148119dc..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,201 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutUWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> mutUWallFunctionFvPatchScalarField::calcYPlus
-(
-    const scalarField& magUp
-) const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchScalarField& rhow = turbModel.rho().boundaryField()[patchi];
-    const fvPatchScalarField& muw = turbModel.mu().boundaryField()[patchi];
-
-    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
-    scalarField& yPlus = tyPlus();
-
-    forAll(yPlus, faceI)
-    {
-        scalar kappaRe = kappa_*magUp[faceI]*y[faceI]/(muw[faceI]/rhow[faceI]);
-
-        scalar yp = yPlusLam_;
-        scalar ryPlusLam = 1.0/yp;
-
-        int iter = 0;
-        scalar yPlusLast = 0.0;
-
-        do
-        {
-            yPlusLast = yp;
-            yp = (kappaRe + yp)/(1.0 + log(E_*yp));
-
-        } while (mag(ryPlusLam*(yp - yPlusLast)) > 0.01 && ++iter < 10);
-
-        yPlus[faceI] = max(0.0, yp);
-    }
-
-    return tyPlus;
-}
-
-
-tmp<scalarField> mutUWallFunctionFvPatchScalarField::calcMut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-    const fvPatchScalarField& muw = turbModel.mu().boundaryField()[patchi];
-
-    tmp<scalarField> tyPlus = calcYPlus(magUp);
-    scalarField& yPlus = tyPlus();
-
-    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
-    scalarField& mutw = tmutw();
-
-    forAll(yPlus, faceI)
-    {
-        if (yPlus[faceI] > yPlusLam_)
-        {
-            mutw[faceI] =
-                muw[faceI]*(yPlus[faceI]*kappa_/log(E_*yPlus[faceI]) - 1.0);
-        }
-    }
-
-    return tmutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
-(
-    const mutUWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
-(
-    const mutUWallFunctionFvPatchScalarField& sawfpsf
-)
-:
-    mutWallFunctionFvPatchScalarField(sawfpsf)
-{}
-
-
-mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
-(
-    const mutUWallFunctionFvPatchScalarField& sawfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(sawfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> mutUWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    return calcYPlus(magUp);
-}
-
-
-void mutUWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    mutUWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 1c6ed4f7d..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::mutUWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition when
-    using wall functions, based on velocity.
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutUWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::compressible::mutWallFunctionFvPatchScalarField
-
-SourceFiles
-    mutUWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutUWallFunctionFvPatchScalarField_H
-#define compressibleMutUWallFunctionFvPatchScalarField_H
-
-#include "mutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-            Class mutUWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutUWallFunctionFvPatchScalarField
-:
-    public mutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate yPLus
-        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutUWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutUWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutUWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutUWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutUWallFunctionFvPatchScalarField
-        (
-            const mutUWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutUWallFunctionFvPatchScalarField
-        (
-            const mutUWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutUWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        mutUWallFunctionFvPatchScalarField
-        (
-            const mutUWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutUWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
deleted file mode 100644
index f4a6476be..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,187 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutWallFunctionFvPatchScalarField.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(mutWallFunctionFvPatchScalarField, 0);
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void mutWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{}
-
-
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
-(
-    const mutWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    yPlusLam_(ptf.yPlusLam_)
-{}
-
-
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{}
-
-
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
-(
-    const mutWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    fixedValueFvPatchScalarField(wfpsf),
-    Cmu_(wfpsf.Cmu_),
-    kappa_(wfpsf.kappa_),
-    E_(wfpsf.E_),
-    yPlusLam_(wfpsf.yPlusLam_)
-{}
-
-
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
-(
-    const mutWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(wfpsf, iF),
-    Cmu_(wfpsf.Cmu_),
-    kappa_(wfpsf.kappa_),
-    E_(wfpsf.E_),
-    yPlusLam_(wfpsf.yPlusLam_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-scalar mutWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-void mutWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    operator==(calcMut());
-
-    fixedValueFvPatchScalarField::updateCoeffs();
-}
-
-
-void mutWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 29bc406aa..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,181 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::mutWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition when
-    using wall functions, based on turbulence kinetic energy.
-    - replicates OpenFOAM v1.5 (and earlier) behaviour
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedValueFvPatchField
-
-SourceFiles
-    mutWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutWallFunctionFvPatchScalarField_H
-#define compressibleMutWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-             Class mutWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const = 0;
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutWallFunctionFvPatchScalarField
-        (
-            const mutWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutWallFunctionFvPatchScalarField
-        (
-            const mutWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct as copy setting internal field reference
-        mutWallFunctionFvPatchScalarField
-        (
-            const mutWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-
-    // Member functions
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        static scalar yPlusLam(const scalar kappa, const scalar E);
-
-        //- Calculate and return the yPlus at the boundary
-        virtual tmp<scalarField> yPlus() const = 0;
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
deleted file mode 100644
index e634b89ac..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,241 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutkRoughWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-scalar mutkRoughWallFunctionFvPatchScalarField::fnRough
-(
-    const scalar KsPlus,
-    const scalar Cs
-) const
-{
-    // Return fn based on non-dimensional roughness height
-
-    if (KsPlus < 90.0)
-    {
-        return pow
-        (
-            (KsPlus - 2.25)/87.75 + Cs*KsPlus,
-            sin(0.4258*(log(KsPlus) - 0.811))
-        );
-    }
-    else
-    {
-        return (1.0 + Cs*KsPlus);
-    }
-}
-
-
-tmp<scalarField> mutkRoughWallFunctionFvPatchScalarField::calcMut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalarField& y = turbModel.y()[patchi];
-    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    tmp<scalarField> tmutw(new scalarField(*this));
-    scalarField& mutw = tmutw();
-
-    forAll(mutw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uStar = Cmu25*sqrt(k[faceCellI]);
-        scalar yPlus = uStar*y[faceI]/(muw[faceI]/rhow[faceI]);
-        scalar KsPlus = uStar*Ks_[faceI]/(muw[faceI]/rhow[faceI]);
-
-        scalar Edash = E_;
-        if (KsPlus > 2.25)
-        {
-            Edash /= fnRough(KsPlus, Cs_[faceI]);
-        }
-
-        scalar limitingMutw = max(mutw[faceI], muw[faceI]);
-
-        // To avoid oscillations limit the change in the wall viscosity
-        // which is particularly important if it temporarily becomes zero
-        mutw[faceI] =
-            max
-            (
-                min
-                (
-                    muw[faceI]
-                   *(yPlus*kappa_/log(max(Edash*yPlus, 1+1e-4)) - 1),
-                    2*limitingMutw
-                ), 0.5*limitingMutw
-            );
-
-        if (debug)
-        {
-            Info<< "yPlus = " << yPlus
-                << ", KsPlus = " << KsPlus
-                << ", Edash = " << Edash
-                << ", mutw = " << mutw[faceI]
-                << endl;
-        }
-    }
-
-    return tmutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutkWallFunctionFvPatchScalarField(p, iF),
-    Ks_(p.size(), 0.0),
-    Cs_(p.size(), 0.0)
-{}
-
-
-mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
-(
-    const mutkRoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    Ks_(ptf.Ks_, mapper),
-    Cs_(ptf.Cs_, mapper)
-{}
-
-
-mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mutkWallFunctionFvPatchScalarField(p, iF, dict),
-    Ks_("Ks", dict, p.size()),
-    Cs_("Cs", dict, p.size())
-{}
-
-
-mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
-(
-    const mutkRoughWallFunctionFvPatchScalarField& rwfpsf
-)
-:
-    mutkWallFunctionFvPatchScalarField(rwfpsf),
-    Ks_(rwfpsf.Ks_),
-    Cs_(rwfpsf.Cs_)
-{}
-
-
-mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
-(
-    const mutkRoughWallFunctionFvPatchScalarField& rwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutkWallFunctionFvPatchScalarField(rwfpsf, iF),
-    Ks_(rwfpsf.Ks_),
-    Cs_(rwfpsf.Cs_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void mutkRoughWallFunctionFvPatchScalarField::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    mutkWallFunctionFvPatchScalarField::autoMap(m);
-    Ks_.autoMap(m);
-    Cs_.autoMap(m);
-}
-
-
-void mutkRoughWallFunctionFvPatchScalarField::rmap
-(
-    const fvPatchScalarField& ptf,
-    const labelList& addr
-)
-{
-    mutkWallFunctionFvPatchScalarField::rmap(ptf, addr);
-
-    const mutkRoughWallFunctionFvPatchScalarField& nrwfpsf =
-        refCast<const mutkRoughWallFunctionFvPatchScalarField>(ptf);
-
-    Cs_.rmap(nrwfpsf.Cs_, addr);
-    Ks_.rmap(nrwfpsf.Ks_, addr);
-}
-
-
-void mutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    Cs_.writeEntry("Cs", os);
-    Ks_.writeEntry("Ks", os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    mutkRoughWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 6ff72c42d..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,206 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::mutkRoughWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition when
-    using wall functions for rough walls, based on turbulence kinetic energy.
-    The condition manipulates the E parameter to account for roughness
-    effects.
-
-    Parameter ranges
-    - roughness height = sand-grain roughness (0 for smooth walls)
-    - roughness constant = 0.5-1.0
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Ks           | sand-grain roughness height | yes     |
-        Cs           | roughness constant      | yes         |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutkRoughWallFunction;
-        Ks              uniform 0;
-        Cs              uniform 0.5;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::compressible::mutkRoughWallFunctionFvPatchScalarField
-
-SourceFiles
-    mutkRoughWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutkRoughWallFunctionFvPatchScalarField_H
-#define compressibleMutkRoughWallFunctionFvPatchScalarField_H
-
-#include "mutkWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-          Class mutkRoughWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutkRoughWallFunctionFvPatchScalarField
-:
-    public mutkWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        //- Roughness height
-        scalarField Ks_;
-
-        //- Roughness constant
-        scalarField Cs_;
-
-
-    // Private Member Functions
-
-        //- Compute the roughness function
-        virtual scalar fnRough(const scalar KsPlus, const scalar Cs) const;
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutkRoughWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutkRoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutkRoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutkRoughWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutkRoughWallFunctionFvPatchScalarField
-        (
-            const mutkRoughWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutkRoughWallFunctionFvPatchScalarField
-        (
-            const mutkRoughWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutkRoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        mutkRoughWallFunctionFvPatchScalarField
-        (
-            const mutkRoughWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutkRoughWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap(const fvPatchFieldMapper&);
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchScalarField&,
-                const labelList&
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 72b010d55..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,163 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mutkWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> mutkWallFunctionFvPatchScalarField::calcMut() const
-{
-    const label patchi = patch().index();
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
-    scalarField& mutw = tmutw();
-
-    forAll(mutw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar yPlus =
-            Cmu25*y[faceI]*sqrt(k[faceCellI])/(muw[faceI]/rhow[faceI]);
-
-        if (yPlus > yPlusLam_)
-        {
-            mutw[faceI] = muw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1);
-        }
-    }
-
-    return tmutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
-(
-    const mutkWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
-(
-    const mutkWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    mutWallFunctionFvPatchScalarField(wfpsf)
-{}
-
-
-mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
-(
-    const mutkWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    mutWallFunctionFvPatchScalarField(wfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> mutkWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    const scalarField kwc(k.boundaryField()[patchi].patchInternalField());
-    const scalarField& muw = turbModel.mu().boundaryField()[patchi];
-    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
-
-    return pow025(Cmu_)*y*sqrt(kwc)/(muw/rhow);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    mutkWallFunctionFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
deleted file mode 100644
index f81625627..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,168 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::mutkWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulent viscosity condition when
-    using wall functions, based on turbulence kinetic energy.
-    - replicates OpenFOAM v1.5 (and earlier) behaviour
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            mutkWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::compressible::mutWallFunctionFvPatchScalarField
-
-SourceFiles
-    mutkWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleMutkWallFunctionFvPatchScalarField_H
-#define compressibleMutkWallFunctionFvPatchScalarField_H
-
-#include "mutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-             Class mutkWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class mutkWallFunctionFvPatchScalarField
-:
-    public mutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcMut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("mutkWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        mutkWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        mutkWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  mutkWallFunctionFvPatchScalarField
-        //  onto a new patch
-        mutkWallFunctionFvPatchScalarField
-        (
-            const mutkWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        mutkWallFunctionFvPatchScalarField
-        (
-            const mutkWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutkWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        mutkWallFunctionFvPatchScalarField
-        (
-            const mutkWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new mutkWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 89d4782aa..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,603 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "omegaWallFunctionFvPatchScalarField.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "fvMatrix.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "mutWallFunctionFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-scalar omegaWallFunctionFvPatchScalarField::tolerance_ = 1e-5;
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void omegaWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-    os.writeKeyword("beta1") << beta1_ << token::END_STATEMENT << nl;
-}
-
-
-void omegaWallFunctionFvPatchScalarField::setMaster()
-{
-    if (master_ != -1)
-    {
-        return;
-    }
-
-    const volScalarField& omega =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
-
-    label master = -1;
-    forAll(bf, patchI)
-    {
-        if (isA<omegaWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            omegaWallFunctionFvPatchScalarField& opf = omegaPatch(patchI);
-
-            if (master == -1)
-            {
-                master = patchI;
-            }
-
-            opf.master() = master;
-        }
-    }
-}
-
-
-void omegaWallFunctionFvPatchScalarField::createAveragingWeights()
-{
-    const volScalarField& omega =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
-
-    const fvMesh& mesh = omega.mesh();
-
-    if (initialised_ && !mesh.changing())
-    {
-        return;
-    }
-
-    volScalarField weights
-    (
-        IOobject
-        (
-            "weights",
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false // do not register
-        ),
-        mesh,
-        dimensionedScalar("zero", dimless, 0.0)
-    );
-
-    DynamicList<label> omegaPatches(bf.size());
-    forAll(bf, patchI)
-    {
-        if (isA<omegaWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            omegaPatches.append(patchI);
-
-            const labelUList& faceCells = bf[patchI].patch().faceCells();
-            forAll(faceCells, i)
-            {
-                label cellI = faceCells[i];
-                weights[cellI]++;
-            }
-        }
-    }
-
-    cornerWeights_.setSize(bf.size());
-    forAll(omegaPatches, i)
-    {
-        label patchI = omegaPatches[i];
-        const fvPatchScalarField& wf = weights.boundaryField()[patchI];
-        cornerWeights_[patchI] = 1.0/wf.patchInternalField();
-    }
-
-    G_.setSize(dimensionedInternalField().size(), 0.0);
-    omega_.setSize(dimensionedInternalField().size(), 0.0);
-
-    initialised_ = true;
-}
-
-
-omegaWallFunctionFvPatchScalarField&
-omegaWallFunctionFvPatchScalarField::omegaPatch(const label patchI)
-{
-    const volScalarField& omega =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
-
-    const omegaWallFunctionFvPatchScalarField& opf =
-        refCast<const omegaWallFunctionFvPatchScalarField>(bf[patchI]);
-
-    return const_cast<omegaWallFunctionFvPatchScalarField&>(opf);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::calculateTurbulenceFields
-(
-    const turbulenceModel& turbulence,
-    scalarField& G0,
-    scalarField& omega0
-)
-{
-    // accumulate all of the G and omega contributions
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            omegaWallFunctionFvPatchScalarField& opf = omegaPatch(patchI);
-
-            const List<scalar>& w = cornerWeights_[patchI];
-
-            opf.calculate(turbulence, w, opf.patch(), G0, omega0);
-        }
-    }
-
-    // apply zero-gradient condition for omega
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            omegaWallFunctionFvPatchScalarField& opf = omegaPatch(patchI);
-
-            opf == scalarField(omega0, opf.patch().faceCells());
-        }
-    }
-}
-
-
-void omegaWallFunctionFvPatchScalarField::calculate
-(
-    const turbulenceModel& turbulence,
-    const List<scalar>& cornerWeights,
-    const fvPatch& patch,
-    scalarField& G,
-    scalarField& omega
-)
-{
-    const label patchI = patch.index();
-
-    const scalarField& y = turbulence.y()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const scalarField& rhow = turbulence.rho().boundaryField()[patchI];
-
-    const tmp<volScalarField> tmu = turbulence.mu();
-    const scalarField& muw = tmu().boundaryField()[patchI];
-
-    const tmp<volScalarField> tmut = turbulence.mut();
-    const volScalarField& mut = tmut();
-    const scalarField& mutw = mut.boundaryField()[patchI];
-
-    const fvPatchVectorField& Uw = turbulence.U().boundaryField()[patchI];
-
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    // Set omega and G
-    forAll(mutw, faceI)
-    {
-        label cellI = patch.faceCells()[faceI];
-
-        scalar w = cornerWeights[faceI];
-
-        scalar omegaVis = 6.0*muw[faceI]/(rhow[faceI]*beta1_*sqr(y[faceI]));
-
-        scalar omegaLog = sqrt(k[cellI])/(Cmu25*kappa_*y[faceI]);
-
-        omega[cellI] += w*sqrt(sqr(omegaVis) + sqr(omegaLog));
-
-        G[cellI] +=
-            w
-           *(mutw[faceI] + muw[faceI])
-           *magGradUw[faceI]
-           *Cmu25*sqrt(k[cellI])
-           /(kappa_*y[faceI]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    beta1_(0.075),
-    yPlusLam_(mutWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const omegaWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    beta1_(ptf.beta1_),
-    yPlusLam_(ptf.yPlusLam_),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    beta1_(dict.lookupOrDefault<scalar>("beta1", 0.075)),
-    yPlusLam_(mutWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-
-    // apply zero-gradient condition on start-up
-    this->operator==(patchInternalField());
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const omegaWallFunctionFvPatchScalarField& owfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(owfpsf),
-    Cmu_(owfpsf.Cmu_),
-    kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_),
-    beta1_(owfpsf.beta1_),
-    yPlusLam_(owfpsf.yPlusLam_),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const omegaWallFunctionFvPatchScalarField& owfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(owfpsf, iF),
-    Cmu_(owfpsf.Cmu_),
-    kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_),
-    beta1_(owfpsf.beta1_),
-    yPlusLam_(owfpsf.yPlusLam_),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-scalarField& omegaWallFunctionFvPatchScalarField::G(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            G_ = 0.0;
-        }
-
-        return G_;
-    }
-
-    return omegaPatch(master_).G();
-}
-
-
-scalarField& omegaWallFunctionFvPatchScalarField::omega(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            omega_ = 0.0;
-        }
-
-        return omega_;
-    }
-
-    return omegaPatch(master_).omega(init);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), omega(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& omega0 = this->omega();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& omega = const_cast<FieldType&>(dimensionedInternalField());
-
-    forAll(*this, faceI)
-    {
-        label cellI = patch().faceCells()[faceI];
-
-        G[cellI] = G0[cellI];
-        omega[cellI] = omega0[cellI];
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void omegaWallFunctionFvPatchScalarField::updateCoeffs
-(
-    const scalarField& weights
-)
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), omega(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& omega0 = this->omega();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& omega = const_cast<FieldType&>(dimensionedInternalField());
-
-    scalarField& omegaf = *this;
-
-    // only set the values if the weights are > tolerance_
-    forAll(weights, faceI)
-    {
-        scalar w = weights[faceI];
-
-        if (w > tolerance_)
-        {
-            label cellI = patch().faceCells()[faceI];
-
-            G[cellI] = (1.0 - w)*G[cellI] + w*G0[cellI];
-            omega[cellI] = (1.0 - w)*omega[cellI] + w*omega0[cellI];
-            omegaf[faceI] = omega[cellI];
-        }
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void omegaWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    matrix.setValues(patch().faceCells(), patchInternalField());
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix,
-    const Field<scalar>& weights
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    // filter weights so that we only apply the constraint where the
-    // weight > SMALL
-    DynamicList<label> constraintCells(weights.size());
-    DynamicList<scalar> constraintomega(weights.size());
-    const labelUList& faceCells = patch().faceCells();
-
-    const DimensionedField<scalar, volMesh>& omega =
-        dimensionedInternalField();
-
-    label nConstrainedCells = 0;
-
-
-    forAll(weights, faceI)
-    {
-        // only set the values if the weights are > tolerance
-        if (weights[faceI] > tolerance_)
-        {
-            nConstrainedCells++;
-
-            label cellI = faceCells[faceI];
-
-            constraintCells.append(cellI);
-            constraintomega.append(omega[cellI]);
-        }
-    }
-
-    if (debug)
-    {
-        Pout<< "Patch: " << patch().name()
-            << ": number of constrained cells = " << nConstrainedCells
-            << " out of " << patch().size()
-            << endl;
-    }
-
-    matrix.setValues
-    (
-        constraintCells,
-        scalarField(constraintomega.xfer())
-    );
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    omegaWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
deleted file mode 100644
index a17c65ef4..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,298 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::compressible::omegaWallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a wall function constraint on turbulnce
-    specific dissipation, omega.  The values are computed using:
-
-        \f[
-            \omega = sqrt(\omega_{vis}^2 + \omega_{log}^2)
-        \f]
-
-    where
-
-    \vartable
-        \omega_{vis} | omega in viscous region
-        \omega_{log} | omega in logarithmic region
-    \endvartable
-
-    Model described by Eq.(15) of:
-    \verbatim
-        Menter, F., Esch, T.
-        "Elements of Industrial Heat Transfer Prediction"
-        16th Brazilian Congress of Mechanical Engineering (COBEM),
-        Nov. 2001
-    \endverbatim
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-        beta1        | model coefficient       | no          | 0.075
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            compressible::omegaWallFunction;
-    }
-    \endverbatim
-
-SourceFiles
-    omegaWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleOmegaWallFunctionFvPatchScalarField_H
-#define compressibleOmegaWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-class turbulenceModel;
-
-/*---------------------------------------------------------------------------*\
-             Class omegaWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class omegaWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Tolerance used in weighted calculations
-        static scalar tolerance_;
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- beta1 coefficient
-        scalar beta1_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-        //- Local copy of turbulence G field
-        scalarField G_;
-
-        //- Local copy of turbulence omega field
-        scalarField omega_;
-
-        //- Initialised flag
-        bool initialised_;
-
-        //- Master patch ID
-        label master_;
-
-        //- List of averaging corner weights
-        List<List<scalar> > cornerWeights_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-        //- Set the master patch - master is responsible for updating all
-        //  wall function patches
-        virtual void setMaster();
-
-        //- Create the averaging weights for cells which are bounded by
-        //  multiple wall function faces
-        virtual void createAveragingWeights();
-
-        //- Helper function to return non-const access to an omega patch
-        virtual omegaWallFunctionFvPatchScalarField& omegaPatch
-        (
-            const label patchI
-        );
-
-        //- Main driver to calculate the turbulence fields
-        virtual void calculateTurbulenceFields
-        (
-            const turbulenceModel& turbulence,
-            scalarField& G0,
-            scalarField& omega0
-        );
-
-        //- Calculate the omega and G
-        virtual void calculate
-        (
-            const turbulenceModel& turbulence,
-            const List<scalar>& cornerWeights,
-            const fvPatch& patch,
-            scalarField& G,
-            scalarField& omega
-        );
-
-        //- Return non-const access to the master patch ID
-        virtual label& master()
-        {
-            return master_;
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::omegaWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        omegaWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        omegaWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        // omegaWallFunctionFvPatchScalarField
-        //  onto a new patch
-        omegaWallFunctionFvPatchScalarField
-        (
-            const omegaWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        omegaWallFunctionFvPatchScalarField
-        (
-            const omegaWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new omegaWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        omegaWallFunctionFvPatchScalarField
-        (
-            const omegaWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new omegaWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Access
-
-            //- Return non-const access to the master's G field
-            scalarField& G(bool init = false);
-
-            //- Return non-const access to the master's omega field
-            scalarField& omega(bool init = false);
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs(const scalarField& weights);
-
-            //- Manipulate matrix
-            virtual void manipulateMatrix(fvMatrix<scalar>& matrix);
-
-            //- Manipulate matrix with given weights
-            virtual void manipulateMatrix
-            (
-                fvMatrix<scalar>& matrix,
-                const scalarField& weights
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
deleted file mode 100644
index 6759772f1..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,254 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "v2WallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void v2WallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("v2WallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void v2WallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-}
-
-
-scalar v2WallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField
-(
-    const v2WallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    yPlusLam_(ptf.yPlusLam_)
-{
-    checkType();
-}
-
-
-v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField
-(
-    const v2WallFunctionFvPatchScalarField& v2wfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(v2wfpsf),
-    Cmu_(v2wfpsf.Cmu_),
-    kappa_(v2wfpsf.kappa_),
-    E_(v2wfpsf.E_),
-    yPlusLam_(v2wfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField
-(
-    const v2WallFunctionFvPatchScalarField& v2wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(v2wfpsf, iF),
-    Cmu_(v2wfpsf.Cmu_),
-    kappa_(v2wfpsf.kappa_),
-    E_(v2wfpsf.E_),
-    yPlusLam_(v2wfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void v2WallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbulence.y()[patchI];
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tmu = turbulence.mu();
-    const scalarField& muw = tmu().boundaryField()[patchI];
-
-    const scalarField& rhow = turbulence.rho().boundaryField()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    scalarField& v2 = *this;
-
-    // Set v2 wall values
-    forAll(v2, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uTau = Cmu25*sqrt(k[faceCellI]);
-
-        scalar yPlus = uTau*y[faceI]/(muw[faceI]/rhow[faceI]);
-
-        if (yPlus > yPlusLam_)
-        {
-            scalar Cv2 = 0.193;
-            scalar Bv2 = -0.94;
-            v2[faceI] = Cv2/kappa_*log(yPlus) + Bv2;
-        }
-        else
-        {
-            scalar Cv2 = 0.193;
-            v2[faceI] = Cv2*pow4(yPlus);
-        }
-
-        v2[faceI] *= sqr(uTau);
-    }
-
-    fixedValueFvPatchField<scalar>::updateCoeffs();
-
-    // TODO: perform averaging for cells sharing more than one boundary face
-}
-
-
-void v2WallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes commsType
-)
-{
-    fixedValueFvPatchField<scalar>::evaluate(commsType);
-}
-
-
-void v2WallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    writeLocalEntries(os);
-    fixedValueFvPatchField<scalar>::write(os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    v2WallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
deleted file mode 100644
index dc64df934..000000000
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,211 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 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/>.
-
-Class
-    Foam::compressible::RASModels::v2WallFunctionFvPatchScalarField
-
-Group
-    grpCmpWallFunctions
-
-Description
-    This boundary condition provides a turbulence stress normal to streamlines
-    wall function condition for low- and high-Reynolds number, turbulent flow
-    cases.
-
-    The model operates in two modes, based on the computed laminar-to-turbulent
-    switch-over y+ value derived from kappa and E.
-
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            v2WallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedValueFvPatchField
-
-SourceFiles
-    v2WallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef v2WallFunctionFvPatchScalarField_H
-#define v2WallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-              Class v2WallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class v2WallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        scalar yPlusLam(const scalar kappa, const scalar E);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("compressible::v2WallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        v2WallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        v2WallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given v2WallFunctionFvPatchScalarField
-        //  onto a new patch
-        v2WallFunctionFvPatchScalarField
-        (
-            const v2WallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        v2WallFunctionFvPatchScalarField
-        (
-            const v2WallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new v2WallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        v2WallFunctionFvPatchScalarField
-        (
-            const v2WallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new v2WallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Evaluate the patchField
-            virtual void evaluate(const Pstream::commsTypes);
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
deleted file mode 100644
index a4089610c..000000000
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ /dev/null
@@ -1,344 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kEpsilon.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(kEpsilon, 0);
-addToRunTimeSelectionTable(RASModel, kEpsilon, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kEpsilon::kEpsilon
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    C3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C3",
-            coeffDict_,
-            -0.33
-        )
-    ),
-    sigmak_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmak",
-            coeffDict_,
-            1.0
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateMut("mut", mesh_)
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> kEpsilon::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - (mut_/rho_)*dev(twoSymm(fvc::grad(U_))),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> kEpsilon::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool kEpsilon::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        C3_.readIfPresent(coeffDict());
-        sigmak_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void kEpsilon::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volScalarField divU(fvc::div(phi_/fvc::interpolate(rho_)));
-
-    if (mesh_.moving())
-    {
-        divU += fvc::div(mesh_.phi());
-    }
-
-    tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G(GName(), mut_*(tgradU() && dev(twoSymm(tgradU()))));
-    tgradU.clear();
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1_*G*epsilon_/k_
-      - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*rho_*divU, epsilon_)
-      - fvm::Sp(C2_*rho_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho_, k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G
-      - fvm::SuSp((2.0/3.0)*rho_*divU, k_)
-      - fvm::Sp(rho_*epsilon_/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
deleted file mode 100644
index 70b5e85a9..000000000
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
+++ /dev/null
@@ -1,200 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::compressible::RASModels::kEpsilon
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Standard k-epsilon turbulence model for compressible flows
-    including rapid distortion theory (RDT) based compression term.
-
-    Reference:
-    \verbatim
-        "k-epsilon equations for compressible reciprocating engine flows"
-        El Tahry, S. H.,
-        AIAA Journal of Energy 7, 1983, pp 345-353.
-    \endverbatim
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        kEpsilonCoeffs
-        {
-            Cmu         0.09;
-            C1          1.44;
-            C2          1.92;
-            C3          -0.33;  // only for compressible
-            sigmak      1.0;    // only for compressible
-            sigmaEps    1.3;
-            Prt         1.0;    // only for compressible
-        }
-    \endverbatim
-
-SourceFiles
-    kEpsilon.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressiblekEpsilon_H
-#define compressiblekEpsilon_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class kEpsilon Declaration
-\*---------------------------------------------------------------------------*/
-
-class kEpsilon
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar C3_;
-            dimensionedScalar sigmak_;
-            dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
-
-        // Fields
-
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kEpsilon");
-
-    // Constructors
-
-        //- Construct from components
-        kEpsilon
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~kEpsilon()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", mut_/sigmak_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
deleted file mode 100644
index 0f74e6539..000000000
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ /dev/null
@@ -1,511 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kOmegaSST.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(kOmegaSST, 0);
-addToRunTimeSelectionTable(RASModel, kOmegaSST, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> kOmegaSST::F1(const volScalarField& CDkOmega) const
-{
-    tmp<volScalarField> CDkOmegaPlus = max
-    (
-        CDkOmega,
-        dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10)
-    );
-
-    tmp<volScalarField> arg1 = min
-    (
-        min
-        (
-            max
-            (
-                (scalar(1)/betaStar_)*sqrt(k_)/(omega_*y_),
-                scalar(500)*(mu()/rho_)/(sqr(y_)*omega_)
-            ),
-            (4*alphaOmega2_)*k_/(CDkOmegaPlus*sqr(y_))
-        ),
-        scalar(10)
-    );
-
-    return tanh(pow4(arg1));
-}
-
-tmp<volScalarField> kOmegaSST::F2() const
-{
-    tmp<volScalarField> arg2 = min
-    (
-        max
-        (
-            (scalar(2)/betaStar_)*sqrt(k_)/(omega_*y_),
-            scalar(500)*(mu()/rho_)/(sqr(y_)*omega_)
-        ),
-        scalar(100)
-    );
-
-    return tanh(sqr(arg2));
-}
-
-
-tmp<volScalarField> kOmegaSST::F3() const
-{
-    tmp<volScalarField> arg3 = min
-    (
-        150*(mu()/rho_)/(omega_*sqr(y_)),
-        scalar(10)
-    );
-
-    return 1 - tanh(pow4(arg3));
-}
-
-
-tmp<volScalarField> kOmegaSST::F23() const
-{
-    tmp<volScalarField> f23(F2());
-
-    if (F3_)
-    {
-        f23() *= F3();
-    }
-
-    return f23;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kOmegaSST::kOmegaSST
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    alphaK1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK1",
-            coeffDict_,
-            0.85
-        )
-    ),
-    alphaK2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK2",
-            coeffDict_,
-            1.0
-        )
-    ),
-    alphaOmega1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega1",
-            coeffDict_,
-            0.5
-        )
-    ),
-    alphaOmega2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega2",
-            coeffDict_,
-            0.856
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-    gamma1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma1",
-            coeffDict_,
-            5.0/9.0
-        )
-    ),
-    gamma2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma2",
-            coeffDict_,
-            0.44
-        )
-    ),
-    beta1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta1",
-            coeffDict_,
-            0.075
-        )
-    ),
-    beta2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta2",
-            coeffDict_,
-            0.0828
-        )
-    ),
-    betaStar_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "betaStar",
-            coeffDict_,
-            0.09
-        )
-    ),
-    a1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "a1",
-            coeffDict_,
-            0.31
-        )
-    ),
-    b1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "b1",
-            coeffDict_,
-            1.0
-        )
-    ),
-    c1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "c1",
-            coeffDict_,
-            10.0
-        )
-    ),
-    F3_
-    (
-        Switch::lookupOrAddToDict
-        (
-            "F3",
-            coeffDict_,
-            false
-        )
-    ),
-
-    y_(wallDist::New(mesh_).y()),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    omega_
-    (
-        IOobject
-        (
-            "omega",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateOmega("omega", mesh_)
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateMut("mut", mesh_)
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(omega_, omegaMin_);
-
-    mut_ =
-    (
-        a1_*rho_*k_
-      / max
-        (
-            a1_*omega_,
-            b1_*F23()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
-        )
-    );
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> kOmegaSST::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - (mut_/rho_)*dev(twoSymm(fvc::grad(U_))),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> kOmegaSST::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool kOmegaSST::read()
-{
-    if (RASModel::read())
-    {
-        alphaK1_.readIfPresent(coeffDict());
-        alphaK2_.readIfPresent(coeffDict());
-        alphaOmega1_.readIfPresent(coeffDict());
-        alphaOmega2_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-        gamma1_.readIfPresent(coeffDict());
-        gamma2_.readIfPresent(coeffDict());
-        beta1_.readIfPresent(coeffDict());
-        beta2_.readIfPresent(coeffDict());
-        betaStar_.readIfPresent(coeffDict());
-        a1_.readIfPresent(coeffDict());
-        b1_.readIfPresent(coeffDict());
-        c1_.readIfPresent(coeffDict());
-        F3_.readIfPresent("F3", coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void kOmegaSST::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ =
-            a1_*rho_*k_
-           /max(a1_*omega_, F23()*sqrt(2.0)*mag(symm(fvc::grad(U_))));
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volScalarField divU(fvc::div(phi_/fvc::interpolate(rho_)));
-
-    if (mesh_.moving())
-    {
-        divU += fvc::div(mesh_.phi());
-    }
-
-    tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField S2(2*magSqr(symm(tgradU())));
-    volScalarField GbyMu((tgradU() && dev(twoSymm(tgradU()))));
-    volScalarField G(GName(), mut_*GbyMu);
-    tgradU.clear();
-
-    // Update omega and G at the wall
-    omega_.boundaryField().updateCoeffs();
-
-    volScalarField CDkOmega
-    (
-        (2*alphaOmega2_)*(fvc::grad(k_) & fvc::grad(omega_))/omega_
-    );
-
-    volScalarField F1(this->F1(CDkOmega));
-    volScalarField rhoGammaF1(rho_*gamma(F1));
-
-    // Turbulent frequency equation
-    tmp<fvScalarMatrix> omegaEqn
-    (
-        fvm::ddt(rho_, omega_)
-      + fvm::div(phi_, omega_)
-      - fvm::laplacian(DomegaEff(F1), omega_)
-     ==
-        rhoGammaF1
-       *min
-        (
-            GbyMu,
-            (c1_/a1_)*betaStar_*omega_*max(a1_*omega_, b1_*F23()*sqrt(S2))
-        )
-      - fvm::SuSp((2.0/3.0)*rhoGammaF1*divU, omega_)
-      - fvm::Sp(rho_*beta(F1)*omega_, omega_)
-      - fvm::SuSp
-        (
-            rho_*(F1 - scalar(1))*CDkOmega/omega_,
-            omega_
-        )
-    );
-
-    omegaEqn().relax();
-
-    omegaEqn().boundaryManipulate(omega_.boundaryField());
-
-    solve(omegaEqn);
-    bound(omega_, omegaMin_);
-
-    // Turbulent kinetic energy equation
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho_, k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(F1), k_)
-     ==
-        min(G, (c1_*betaStar_)*rho_*k_*omega_)
-      - fvm::SuSp(2.0/3.0*rho_*divU, k_)
-      - fvm::Sp(rho_*betaStar_*omega_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    mut_ = a1_*rho_*k_/max(a1_*omega_, b1_*F23()*sqrt(S2));
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
deleted file mode 100644
index f17484e97..000000000
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
+++ /dev/null
@@ -1,316 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::compressible::RASModels::kOmegaSST
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Implementation of the k-omega-SST turbulence model for compressible flows.
-
-    Turbulence model described in
-    \verbatim
-        Menter, F., Esch, T.,
-        "Elements of Industrial Heat Transfer Prediction",
-        16th Brazilian Congress of Mechanical Engineering (COBEM),
-        Nov. 2001.
-    \endverbatim
-
-    with updated coefficients from
-    \verbatim
-        Menter, F. R., Kuntz, M., and Langtry, R.,
-        "Ten Years of Industrial Experience with the SST Turbulence Model",
-        Turbulence, Heat and Mass Transfer 4, 2003,
-        pp. 625 - 632.
-    \endverbatim
-
-    but with the consistent production terms from the 2001 paper as form in the
-    2003 paper is a typo, see
-    \verbatim
-        http://turbmodels.larc.nasa.gov/sst.html
-    \endverbatim
-
-    and the addition of the optional F3 term for rough walls from
-    \verbatim
-        Hellsten, A.
-        "Some Improvements in Menter’s k-omega-SST turbulence model"
-        29th AIAA Fluid Dynamics Conference,
-        AIAA-98-2554,
-        June 1998.
-    \endverbatim
-
-    Note that this implementation is written in terms of alpha diffusion
-    coefficients rather than the more traditional sigma (alpha = 1/sigma) so
-    that the blending can be applied to all coefficuients in a consistent
-    manner.  The paper suggests that sigma is blended but this would not be
-    consistent with the blending of the k-epsilon and k-omega models.
-
-    Also note that the error in the last term of equation (2) relating to
-    sigma has been corrected.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        kOmegaSSTCoeffs
-        {
-            alphaK1     0.85;
-            alphaK2     1.0;
-            alphaOmega1 0.5;
-            alphaOmega2 0.856;
-            beta1       0.075;
-            beta2       0.0828;
-            betaStar    0.09;
-            gamma1      5/9;
-            gamma2      0.44;
-            a1          0.31;
-            b1          1.0;
-            c1          10.0;
-            F3          no;
-            Prt         1.0;
-        }
-    \endverbatim
-
-SourceFiles
-    kOmegaSST.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressiblekOmegaSST_H
-#define compressiblekOmegaSST_H
-
-#include "RASModel.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                          Class kOmegaSST Declaration
-\*---------------------------------------------------------------------------*/
-
-class kOmegaSST
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar alphaK1_;
-            dimensionedScalar alphaK2_;
-
-            dimensionedScalar alphaOmega1_;
-            dimensionedScalar alphaOmega2_;
-
-            dimensionedScalar Prt_;
-
-            dimensionedScalar gamma1_;
-            dimensionedScalar gamma2_;
-
-            dimensionedScalar beta1_;
-            dimensionedScalar beta2_;
-
-            dimensionedScalar betaStar_;
-
-            dimensionedScalar a1_;
-            dimensionedScalar b1_;
-            dimensionedScalar c1_;
-
-            Switch F3_;
-
-
-        // Fields
-
-            //- Wall distance
-            //  Note: different to wall distance in parent RASModel
-            //  which is for near-wall cells only
-            const volScalarField& y_;
-
-            volScalarField k_;
-            volScalarField omega_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-
-    // Private Member Functions
-
-        tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
-        tmp<volScalarField> F2() const;
-        tmp<volScalarField> F3() const;
-        tmp<volScalarField> F23() const;
-
-        tmp<volScalarField> blend
-        (
-            const volScalarField& F1,
-            const dimensionedScalar& psi1,
-            const dimensionedScalar& psi2
-        ) const
-        {
-            return F1*(psi1 - psi2) + psi2;
-        }
-
-        tmp<volScalarField> alphaK(const volScalarField& F1) const
-        {
-            return blend(F1, alphaK1_, alphaK2_);
-        }
-
-        tmp<volScalarField> alphaOmega(const volScalarField& F1) const
-        {
-            return blend(F1, alphaOmega1_, alphaOmega2_);
-        }
-
-        tmp<volScalarField> beta(const volScalarField& F1) const
-        {
-            return blend(F1, beta1_, beta2_);
-        }
-
-        tmp<volScalarField> gamma(const volScalarField& F1) const
-        {
-            return blend(F1, gamma1_, gamma2_);
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kOmegaSST");
-
-
-    // Constructors
-
-        //- Construct from components
-        kOmegaSST
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~kOmegaSST()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", alphaK(F1)*mut_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for omega
-        tmp<volScalarField> DomegaEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DomegaEff", alphaOmega(F1)*mut_ + mu())
-            );
-        }
-
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        virtual tmp<volScalarField> omega() const
-        {
-            return omega_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (
-                        "epsilon",
-                        mesh_.time().timeName(),
-                        mesh_
-                    ),
-                    betaStar_*k_*omega_,
-                    omega_.boundaryField().types()
-                )
-            );
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
deleted file mode 100644
index aa3200ee8..000000000
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C
+++ /dev/null
@@ -1,218 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "laminar.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(RASModel, laminar, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-laminar::laminar
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> laminar::mut() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "mut",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("mut", mu().dimensions(), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::alphat() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "alphat",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("alphat", alpha().dimensions(), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::k() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("k", sqr(U_.dimensions()), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::epsilon() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "epsilon",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar
-            (
-                "epsilon", sqr(U_.dimensions())/dimTime, 0.0
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedSymmTensor
-            (
-                "R", sqr(U_.dimensions()), symmTensor::zero
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -mu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool laminar::read()
-{
-    return RASModel::read();
-}
-
-
-void laminar::correct()
-{}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
deleted file mode 100644
index 0b099d01a..000000000
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H
+++ /dev/null
@@ -1,140 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::RASModels::laminar
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Dummy turbulence model for laminar compressible flow.
-
-SourceFiles
-    laminar.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleRasLaminar_H
-#define compressibleRasLaminar_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class laminar Declaration
-\*---------------------------------------------------------------------------*/
-
-class laminar
-:
-    public RASModel
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("laminar");
-
-    // Constructors
-
-        //- Construct from components
-        laminar
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~laminar()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> mut() const;
-
-        //- Return the effective viscosity, i.e. the laminar viscosity
-        virtual tmp<volScalarField> muEff() const
-        {
-            return tmp<volScalarField>(new volScalarField("muEff", mu()));
-        }
-
-        //- Return the turbulence thermal diffusivity, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> alphat() const;
-
-        //- Return the effective turbulent thermal diffusivity,
-        //  i.e. the laminar thermal diffusivity
-        virtual tmp<volScalarField> alphaEff() const
-        {
-            return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
-        }
-
-        //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> k() const;
-
-        //- Return the turbulence kinetic energy dissipation rate,
-        //  i.e. 0 for laminar flow
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor, i.e. the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Correct the laminar viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
deleted file mode 100644
index c9b5c3674..000000000
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ /dev/null
@@ -1,384 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "realizableKE.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(realizableKE, 0);
-addToRunTimeSelectionTable(RASModel, realizableKE, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> realizableKE::rCmu
-(
-    const volTensorField& gradU,
-    const volScalarField& S2,
-    const volScalarField& magS
-)
-{
-    tmp<volSymmTensorField> tS = dev(symm(gradU));
-    const volSymmTensorField& S = tS();
-
-    volScalarField W
-    (
-        (2*sqrt(2.0))*((S&S)&&S)
-       /(
-            magS*S2
-          + dimensionedScalar("small", dimensionSet(0, 0, -3, 0, 0), SMALL)
-        )
-    );
-
-    tS.clear();
-
-    volScalarField phis
-    (
-        (1.0/3.0)*acos(min(max(sqrt(6.0)*W, -scalar(1)), scalar(1)))
-    );
-    volScalarField As(sqrt(6.0)*cos(phis));
-    volScalarField Us(sqrt(S2/2.0 + magSqr(skew(gradU))));
-
-    return 1.0/(A0_ + As*Us*k_/epsilon_);
-}
-
-
-tmp<volScalarField> realizableKE::rCmu
-(
-    const volTensorField& gradU
-)
-{
-    volScalarField S2(2*magSqr(dev(symm(gradU))));
-    volScalarField magS(sqrt(S2));
-    return rCmu(gradU, S2, magS);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-realizableKE::realizableKE
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    A0_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "A0",
-            coeffDict_,
-            4.0
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.9
-        )
-    ),
-    sigmak_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmak",
-            coeffDict_,
-            1.0
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.2
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateMut("mut", mesh_)
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateAlphat("alphat", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> realizableKE::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - (mut_/rho_)*dev(twoSymm(fvc::grad(U_))),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> realizableKE::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool realizableKE::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        A0_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        sigmak_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        Prt_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void realizableKE::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volScalarField divU(fvc::div(phi_/fvc::interpolate(rho_)));
-
-    if (mesh_.moving())
-    {
-        divU += fvc::div(mesh_.phi());
-    }
-
-    volTensorField gradU(fvc::grad(U_));
-    volScalarField S2(2*magSqr(dev(symm(gradU))));
-    volScalarField magS(sqrt(S2));
-
-    volScalarField eta(magS*k_/epsilon_);
-    volScalarField C1(max(eta/(scalar(5) + eta), scalar(0.43)));
-
-    volScalarField G(GName(), mut_*(gradU && dev(twoSymm(gradU))));
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1*rho_*magS*epsilon_
-      - fvm::Sp
-        (
-            C2_*rho_*epsilon_/(k_ + sqrt((mu()/rho_)*epsilon_)),
-            epsilon_
-        )
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho_, k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G - fvm::SuSp(2.0/3.0*rho_*divU, k_)
-      - fvm::Sp(rho_*epsilon_/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-    // Re-calculate viscosity
-    mut_ = rCmu(gradU, S2, magS)*rho_*sqr(k_)/epsilon_;
-    mut_.correctBoundaryConditions();
-
-    // Re-calculate thermal diffusivity
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
deleted file mode 100644
index c417fa5c4..000000000
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
+++ /dev/null
@@ -1,214 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::RASModels::realizableKE
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Realizable k-epsilon turbulence model for compressible flows.
-
-    Model described in the paper:
-    \verbatim
-        "A New k-epsilon Eddy Viscosity Model for High Reynolds Number
-        Turbulent Flows"
-
-        Tsan-Hsing Shih, William W. Liou, Aamir Shabbir, Zhigang Tang and
-        Jiang Zhu
-
-        Computers and Fluids Vol. 24, No. 3, pp. 227-238, 1995
-    \endverbatim
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        realizableKECoeffs
-        {
-            Cmu         0.09;
-            A0          4.0;
-            C2          1.9;
-            sigmak      1.0;
-            sigmaEps    1.2;
-            Prt         1.0;    // only for compressible
-        }
-    \endverbatim
-
-SourceFiles
-    realizableKE.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef realizableKE_H
-#define realizableKE_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class realizableKE Declaration
-\*---------------------------------------------------------------------------*/
-
-class realizableKE
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar A0_;
-            dimensionedScalar C2_;
-            dimensionedScalar sigmak_;
-            dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
-
-
-        // Fields
-
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField mut_;
-            volScalarField alphat_;
-
-
-   // Protected Member Functions
-
-        tmp<volScalarField> rCmu
-        (
-            const volTensorField& gradU,
-            const volScalarField& S2,
-            const volScalarField& magS
-        );
-
-        tmp<volScalarField> rCmu(const volTensorField& gradU);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("realizableKE");
-
-    // Constructors
-
-        //- Construct from components
-        realizableKE
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~realizableKE()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", mut_/sigmak_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/v2f/v2f.C b/src/turbulenceModels/compressible/RAS/v2f/v2f.C
deleted file mode 100644
index ec0c37363..000000000
--- a/src/turbulenceModels/compressible/RAS/v2f/v2f.C
+++ /dev/null
@@ -1,493 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "v2f.H"
-#include "fixedValueFvPatchField.H"
-#include "zeroGradientFvPatchField.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(v2f, 0);
-addToRunTimeSelectionTable(RASModel, v2f, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-wordList v2f::RBoundaryTypes() const
-{
-    const volScalarField::GeometricBoundaryField& bf(k_.boundaryField());
-
-    wordList bTypes
-    (
-        bf.size(),
-        zeroGradientFvPatchField<symmTensor>::typeName
-    );
-
-    forAll(bf, patchI)
-    {
-        if (bf[patchI].fixesValue())
-        {
-            bTypes[patchI] = fixedValueFvPatchField<symmTensor>::typeName;
-        }
-    }
-
-    return bTypes;
-}
-
-
-tmp<volScalarField> v2f::davidsonCorrectNut
-(
-    const tmp<volScalarField>& value
-) const
-{
-    return min(CmuKEps_*sqr(k_)/epsilon_, value);
-}
-
-
-tmp<volScalarField> v2f::Ts() const
-{
-    return max(k_/epsilon_, 6.0*sqrt(mu()/rho_/epsilon_));
-}
-
-
-tmp<volScalarField> v2f::Ls() const
-{
-    return
-        CL_*max(pow(k_, 1.5)/epsilon_, Ceta_*pow025(pow3(mu()/rho_)/epsilon_));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-v2f::v2f
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.22
-        )
-    ),
-    CmuKEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "CmuKEps",
-            coeffDict_,
-            0.09
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.4
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            0.3
-        )
-    ),
-    CL_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "CL",
-            coeffDict_,
-            0.23
-        )
-    ),
-    Ceta_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceta",
-            coeffDict_,
-            70.0
-        )
-    ),
-    Ceps2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceps2",
-            coeffDict_,
-            1.9
-        )
-    ),
-    Ceps3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceps3",
-            coeffDict_,
-            -0.33
-        )
-    ),
-    sigmaK_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaK",
-            coeffDict_,
-            1.0
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    Prt_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Prt",
-            coeffDict_,
-            1.0
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    v2_
-    (
-        IOobject
-        (
-            "v2",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    f_
-    (
-        IOobject
-        (
-            "f",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    mut_
-    (
-        IOobject
-        (
-            "mut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    alphat_
-    (
-        IOobject
-        (
-            "alphat",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    v2Min_(dimensionedScalar("v2Min", v2_.dimensions(), SMALL)),
-    fMin_(dimensionedScalar("fMin", f_.dimensions(), 0.0))
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-    bound(v2_, v2Min_);
-    bound(f_, fMin_);
-
-    mut_ = rho_*davidsonCorrectNut(Cmu_*v2_*Ts());
-    mut_.correctBoundaryConditions();
-
-    alphat_ = mut_/Prt_;
-    alphat_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> v2f::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - (mut_/rho_)*dev(twoSymm(fvc::grad(U_))),
-            RBoundaryTypes()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> v2f::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -muEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> v2f::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-bool v2f::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        CmuKEps_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        CL_.readIfPresent(coeffDict());
-        Ceta_.readIfPresent(coeffDict());
-        Ceps2_.readIfPresent(coeffDict());
-        sigmaK_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void v2f::correct()
-{
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
-        mut_.correctBoundaryConditions();
-
-        // Re-calculate thermal diffusivity
-        alphat_ = mut_/Prt_;
-        alphat_.correctBoundaryConditions();
-
-        return;
-    }
-
-    RASModel::correct();
-
-    volScalarField divU(fvc::div(phi_/fvc::interpolate(rho_)));
-
-    if (mesh_.moving())
-    {
-        divU += fvc::div(mesh_.phi());
-    }
-
-    // use N=6 so that f=0 at walls
-    const dimensionedScalar N("N", dimless, 6.0);
-
-    const volTensorField gradU(fvc::grad(U_));
-    const volScalarField S2(2*magSqr(dev(symm(gradU))));
-
-    const volScalarField G(GName(), mut_*S2);
-    const volScalarField T(Ts());
-    const volScalarField L2("v2f.L2", sqr(Ls()));
-    const volScalarField alpha
-    (
-        "v2f::alpha",
-        1.0/T*((C1_ - N)*v2_ - 2.0/3.0*k_*(C1_ - 1.0))
-    );
-    const volScalarField Ceps1
-    (
-        "Ceps1",
-        1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0)))
-    );
-
-    // Update epsilon (and possibly G) at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(rho_, epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        Ceps1*G/T
-      - fvm::SuSp(((2.0/3.0)*Ceps1 + Ceps3_)*rho_*divU, epsilon_)
-      - fvm::Sp(Ceps2_*rho_/T, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-    // Turbulent kinetic energy equation
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(rho_, k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G
-      - fvm::SuSp((2.0/3.0)*rho_*divU, k_)
-      - fvm::Sp(rho_*epsilon_/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-    // Relaxation function equation
-    tmp<fvScalarMatrix> fEqn
-    (
-      - fvm::laplacian(rho_, f_)
-     ==
-      - fvm::Sp(rho_/L2, f_)
-      - 1.0/L2/k_*(rho_*alpha - C2_*G)
-    );
-
-    fEqn().relax();
-    solve(fEqn);
-    bound(f_, fMin_);
-
-    // Turbulence stress normal to streamlines equation
-    tmp<fvScalarMatrix> v2Eqn
-    (
-        fvm::ddt(rho_, v2_)
-      + fvm::div(phi_, v2_)
-      - fvm::laplacian(DkEff(), v2_)
-      ==
-        min(rho_*k_*f_, -rho_*alpha + C2_*G)
-      - fvm::Sp(rho_*N*epsilon_/k_, v2_)
-    );
-
-    v2Eqn().relax();
-    solve(v2Eqn);
-    bound(v2_, v2Min_);
-
-    // Re-calculate viscosity
-    mut_ = rho_*davidsonCorrectNut(Cmu_*v2_*T);
-    mut_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/v2f/v2f.H b/src/turbulenceModels/compressible/RAS/v2f/v2f.H
deleted file mode 100644
index ce53c248b..000000000
--- a/src/turbulenceModels/compressible/RAS/v2f/v2f.H
+++ /dev/null
@@ -1,288 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 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/>.
-
-Class
-    Foam::compressible::RASModels::v2f
-
-Group
-    grpCmpRASTurbulence
-
-Description
-    Lien and Kalitzin's v2-f turbulence model for incompressible flows, with
-    a limit imposed on the turbulent viscosity given by Davidson et al.
-
-    The model solves for turbulence k and epsilon, with additional equations
-    for the turbulence stress normal to streamlines, v2, and elliptic damping
-    function, f.  The variant implemented employs N=6, such that f=0 on walls.
-
-    Wall boundary conditions are:
-
-        k       = kLowReWallFunction
-        epsilon = epsilonLowReWallFunction
-        v2      = v2WallFunction
-        f       = fWallFunction
-
-    These are applicable to both low- and high-Reynolds number flows.
-
-    Inlet values can be approximated by:
-
-        v2      = 2/3 k
-        f       = zero-gradient
-
-
-    References:
-
-    Lien F-S, Kalitzin G, 2001.  Computations of transonic flow with the v2-f
-    turbulence model. Int. J. Heat Fluid Flow 22, pp 53-61
-
-    Davidson L, Nielsen P, Sveningsson A, 2003.  Modifications of the v2-f
-    model for computing the flow in a 3D wall jet.  Turbulence, Heat and Mass
-    Transfer 4, pp 577-584
-
-    The default model coefficients are given as:
-    \verbatim
-        v2fCoeffs
-        {
-            Cmu         0.22;
-            CmuKEps     0.09;
-            C1          1.4;
-            C2          0.3;
-            CL          0.23;
-            Ceta        70;
-            Ceps2       1.9;
-            sigmaEps    1.3;
-            sigmaK      1;
-        }
-    \endverbatim
-
-Note
-    If the kLowReWallFunction is employed, a velocity variant of the turbulent
-    viscosity wall function should be used, e.g. nutUWallFunction.  Turbulence
-    k variants (nutk...) for this case will not behave correctly.
-
-SeeAlso
-    Foam::kEpsilon
-    Foam::kLowReWallFunctionFvPatchScalarField
-    Foam::epsilonLowReWallFunctionFvPatchScalarField
-    Foam::v2WallFunctionFvPatchScalarField
-    Foam::fWallFunctionFvPatchScalarField
-
-SourceFiles
-    v2f.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressiblev2f_H
-#define compressiblev2f_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                             Class v2f Declaration
-\*---------------------------------------------------------------------------*/
-
-class v2f
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar CmuKEps_;
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar CL_;
-            dimensionedScalar Ceta_;
-            dimensionedScalar Ceps2_;
-            dimensionedScalar Ceps3_;
-            dimensionedScalar sigmaK_;
-            dimensionedScalar sigmaEps_;
-            dimensionedScalar Prt_;
-
-        // Fields
-
-            //- Turbulence kinetic energy
-            volScalarField k_;
-
-            //- Turbulence dissipation
-            volScalarField epsilon_;
-
-            //- Turbulence stress normal to streamlines
-            volScalarField v2_;
-
-            //- Damping function
-            volScalarField f_;
-
-            //- Turbulence viscosity
-            volScalarField mut_;
-
-            //- Turbulence thermal diffusivity
-            volScalarField alphat_;
-
-
-        // Bounding values
-
-            dimensionedScalar v2Min_;
-            dimensionedScalar fMin_;
-
-
-    // Protected Member Functions
-
-        //- Return boundary type names for the R field
-        wordList RBoundaryTypes() const;
-
-        //- Apply Davidson correction to nut
-        tmp<volScalarField> davidsonCorrectNut
-        (
-            const tmp<volScalarField>& value
-        ) const;
-
-        //- Return time scale, Ts
-        tmp<volScalarField> Ts() const;
-
-        //- Return length scale, Ls
-        tmp<volScalarField> Ls() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("v2f");
-
-    // Constructors
-
-        //- Construct from components
-        v2f
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~v2f()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", mut_/sigmaK_ + mu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
-            );
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const
-        {
-            return alphat_;
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return turbulence stress normal to streamlines
-        virtual tmp<volScalarField> v2() const
-        {
-            return v2_;
-        }
-
-        //- Return the damping function
-        virtual tmp<volScalarField> f() const
-        {
-            return f_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files
deleted file mode 100644
index 412045016..000000000
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/files
+++ /dev/null
@@ -1,15 +0,0 @@
-turbulenceModel.C
-laminar/laminar.C
-
-derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
-derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
-derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
-derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
-derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
-derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
-
-derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options
deleted file mode 100644
index 9b024f163..000000000
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/options
+++ /dev/null
@@ -1,17 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude
-
-LIB_LIBS = \
-    -lsolidThermo \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsolidSpecie \
-    -lradiationModels
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
deleted file mode 100644
index a7188c5ee..000000000
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
+++ /dev/null
@@ -1,246 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "laminar.H"
-#include "Time.H"
-#include "volFields.H"
-#include "fvcGrad.H"
-#include "fvcDiv.H"
-#include "fvmLaplacian.H"
-#include "addToRunTimeSelectionTable.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(turbulenceModel, laminar, turbulenceModel);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-laminar::laminar
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName
-)
-:
-    turbulenceModel(rho, U, phi, thermophysicalModel, turbulenceModelName)
-{}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<laminar> laminar::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName
-)
-{
-    return autoPtr<laminar>
-    (
-        new laminar(rho, U, phi, thermophysicalModel, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-const dictionary& laminar::coeffDict() const
-{
-    return dictionary::null;
-}
-
-
-tmp<volScalarField> laminar::mut() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "mut",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("mut", mu().dimensions(), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::alphat() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "alphat",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("alphat", alpha().dimensions(), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::k() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("k", sqr(U_.dimensions()), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::epsilon() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "epsilon",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar
-            (
-                "epsilon", sqr(U_.dimensions())/dimTime, 0.0
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedSymmTensor
-            (
-                "R", sqr(U_.dimensions()), symmTensor::zero
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::devRhoReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -mu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(T(fvc::grad(U))))
-    );
-}
-
-
-void laminar::correct()
-{
-    turbulenceModel::correct();
-}
-
-
-bool laminar::read()
-{
-    return true;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
deleted file mode 100644
index b1de35154..000000000
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
+++ /dev/null
@@ -1,177 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::compressible::laminar
-
-Description
-    Turbulence model for laminar compressible flow.
-
-SourceFiles
-    laminar.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleLaminar_H
-#define compressibleLaminar_H
-
-#include "turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class laminar Declaration
-\*---------------------------------------------------------------------------*/
-
-class laminar
-:
-    public turbulenceModel
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("laminar");
-
-    // Constructors
-
-        //- Construct from components
-        laminar
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected turbulence model
-        static autoPtr<laminar> New
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    //- Destructor
-    virtual ~laminar()
-    {}
-
-
-    // Member Functions
-
-        //- Const access to the coefficients dictionary
-        virtual const dictionary& coeffDict() const;
-
-        //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> mut() const;
-
-        //- Return the effective viscosity, i.e. the laminar viscosity
-        virtual tmp<volScalarField> muEff() const
-        {
-            return tmp<volScalarField>(new volScalarField("muEff", mu()));
-        }
-
-        //- Return the turbulence thermal diffusivity, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> alphat() const;
-
-        //- Return the effective turbulent temperature diffusivity,
-        //  i.e. the laminar thermal diffusivity
-        virtual tmp<volScalarField> kappaEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    "kappaEff",
-                    thermo().kappa()
-                )
-            );
-        }
-
-        //- Return the effective turbulent temperature diffusivity for a patch,
-        //  i.e. the laminar thermal diffusivity
-        virtual tmp<scalarField> kappaEff(const label patchI) const
-        {
-            return thermo().kappa(patchI);
-        }
-
-        //- Return the effective turbulent thermal diffusivity,
-        //  i.e. the laminar thermal diffusivity
-        virtual tmp<volScalarField> alphaEff() const
-        {
-            return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
-        }
-
-        //- Return the effective turbulent thermal diffusivity for a patch,
-        //  i.e. the laminar thermal diffusivity
-        virtual tmp<scalarField> alphaEff(const label patchI) const
-        {
-            return alpha().boundaryField()[patchI];
-        }
-
-        //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
-        virtual tmp<volScalarField> k() const;
-
-        //- Return the turbulence kinetic energy dissipation rate,
-        //  i.e. 0 for laminar flow
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor, i.e. the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
-
-        //- Correct the laminar viscosity
-        virtual void correct();
-
-        //- Read turbulenceProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
deleted file mode 100644
index 455ff9a72..000000000
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ /dev/null
@@ -1,155 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulenceModel.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "fvcGrad.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(turbulenceModel, 0);
-defineRunTimeSelectionTable(turbulenceModel, turbulenceModel);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulenceModel::turbulenceModel
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName
-)
-:
-    regIOobject
-    (
-        IOobject
-        (
-            turbulenceModelName,
-            U.time().constant(),
-            U.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        )
-    ),
-    runTime_(U.time()),
-    mesh_(U.mesh()),
-
-    rho_(rho),
-    U_(U),
-    phi_(phi),
-    thermophysicalModel_(thermophysicalModel),
-
-    y_(mesh_)
-{}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<turbulenceModel> turbulenceModel::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const fluidThermo& thermophysicalModel,
-    const word& turbulenceModelName
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "turbulenceProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("simulationType")
-    );
-
-    Info<< "Selecting turbulence model type " << modelType << endl;
-
-    turbulenceModelConstructorTable::iterator cstrIter =
-        turbulenceModelConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == turbulenceModelConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "turbulenceModel::New(const volScalarField&, "
-            "const volVectorField&, const surfaceScalarField&, "
-            "fluidThermo&, const word&)"
-        )   << "Unknown turbulenceModel type "
-            << modelType << nl << nl
-            << "Valid turbulenceModel types:" << endl
-            << turbulenceModelConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<turbulenceModel>
-    (
-        cstrIter()(rho, U, phi, thermophysicalModel, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> turbulenceModel::rhoEpsilonEff() const
-{
-    tmp<volTensorField> tgradU = fvc::grad(U_);
-    return mu()*(tgradU() && dev(twoSymm(tgradU()))) + rho_*epsilon();
-}
-
-
-void turbulenceModel::correct()
-{
-    if (mesh_.changing())
-    {
-        y_.correct();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
deleted file mode 100644
index b7e9195c5..000000000
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ /dev/null
@@ -1,282 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-Namespace
-    Foam::compressible::turbulenceModels
-
-Description
-    Namespace for compressible turbulence turbulence models.
-
-
-Class
-    Foam::compressible::turbulenceModel
-
-Description
-    Abstract base class for compressible turbulence models
-    (RAS, LES and laminar).
-
-
-SourceFiles
-    turbulenceModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef compressibleturbulenceModel_H
-#define compressibleturbulenceModel_H
-
-#include "primitiveFieldsFwd.H"
-#include "volFieldsFwd.H"
-#include "surfaceFieldsFwd.H"
-#include "fvMatricesFwd.H"
-#include "fluidThermo.H"
-#include "nearWallDist.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declarations
-class fvMesh;
-
-namespace compressible
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class turbulenceModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulenceModel
-:
-    public regIOobject
-{
-
-protected:
-
-    // Protected data
-
-        const Time& runTime_;
-        const fvMesh& mesh_;
-
-        const volScalarField& rho_;
-        const volVectorField& U_;
-        const surfaceScalarField& phi_;
-
-        const fluidThermo& thermophysicalModel_;
-
-        //- Near wall distance boundary field
-        nearWallDist y_;
-
-
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        turbulenceModel(const turbulenceModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const turbulenceModel&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("turbulenceModel");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeNewSelectionTable
-        (
-            autoPtr,
-            turbulenceModel,
-            turbulenceModel,
-            (
-                const volScalarField& rho,
-                const volVectorField& U,
-                const surfaceScalarField& phi,
-                const fluidThermo& thermoPhysicalModel,
-                const word& turbulenceModelName
-            ),
-            (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        turbulenceModel
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected turbulence model
-        static autoPtr<turbulenceModel> New
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const fluidThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~turbulenceModel()
-    {}
-
-
-    // Member Functions
-
-        //- Const access to the coefficients dictionary
-        virtual const dictionary& coeffDict() const = 0;
-
-        //- Helper function to return the nam eof the turbulence G field
-        inline word GName() const
-        {
-            return word(type() + ":G");
-        }
-
-        //- Access function to density field
-        const volScalarField& rho() const
-        {
-            return rho_;
-        }
-
-        //- Access function to velocity field
-        const volVectorField& U() const
-        {
-            return U_;
-        }
-
-        //- Access function to flux field
-        const surfaceScalarField& phi() const
-        {
-            return phi_;
-        }
-
-        //- Access function to thermophysical model
-        const fluidThermo& thermo() const
-        {
-             return thermophysicalModel_;
-        }
-
-        //- Return the near wall distances
-        const nearWallDist& y() const
-        {
-            return y_;
-        }
-
-        //- Return the laminar viscosity
-        const volScalarField& mu() const
-        {
-            return thermophysicalModel_.mu();
-        }
-
-        //- Return the laminar thermal conductivity
-        const volScalarField& alpha() const
-        {
-            return thermophysicalModel_.alpha();
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> mut() const = 0;
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> muEff() const = 0;
-
-        //- Return the turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphat() const = 0;
-
-        //- Return the turbulence thermal diffusivity for a patch
-        virtual tmp<scalarField> alphat(const label patchI) const
-        {
-            return alphat()().boundaryField()[patchI];
-        }
-
-        //- Return the effective turbulence temperature diffusivity
-        virtual tmp<volScalarField> kappaEff() const = 0;
-
-        //- Return the effective turbulence temperature diffusivity for a patch
-        virtual tmp<scalarField> kappaEff(const label patchI) const = 0;
-
-        //- Return the effective turbulence thermal diffusivity
-        virtual tmp<volScalarField> alphaEff() const = 0;
-
-        //- Return the effective turbulence thermal diffusivity for a patch
-        virtual tmp<scalarField> alphaEff(const label patchI) const = 0;
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const = 0;
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const = 0;
-
-        //- Return the laminar+turbulence kinetic energy dissipation rate
-        //  Used as the viscous contribution to the energy equations
-        virtual tmp<volScalarField> rhoEpsilonEff() const;
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const = 0;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devRhoReff() const = 0;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct() = 0;
-
-        //- Read LESProperties or RASProperties dictionary
-        virtual bool read() = 0;
-
-        //- Default dummy write function
-        virtual bool writeData(Ostream&) const
-        {
-            return true;
-        }
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/derivedFvPatchFields/Make/files b/src/turbulenceModels/derivedFvPatchFields/Make/files
deleted file mode 100644
index f0a5fdfa8..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-porousBafflePressure/porousBafflePressureFvPatchFields.C
-fixedShearStress/fixedShearStressFvPatchVectorField.C
-
-LIB = $(FOAM_LIBBIN)/libturbulenceDerivedFvPatchFields
diff --git a/src/turbulenceModels/derivedFvPatchFields/Make/options b/src/turbulenceModels/derivedFvPatchFields/Make/options
deleted file mode 100644
index 66712d18e..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/Make/options
+++ /dev/null
@@ -1,16 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lmeshTools \
-    -lcompressibleTurbulenceModel \
-    -lincompressibleTurbulenceModel
diff --git a/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
deleted file mode 100644
index 587ad9678..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fixedShearStressFvPatchVectorField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "compressible/turbulenceModel/turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchVectorField(p, iF),
-    phiName_("phi"),
-    rhoName_("rho"),
-    tau0_(vector::zero)
-{}
-
-
-Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchVectorField(p, iF),
-    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    tau0_(dict.lookupOrDefault<vector>("tau", vector::zero))
-{
-    fvPatchField<vector>::operator=(patchInternalField());
-}
-
-
-Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
-(
-    const fixedShearStressFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_),
-    tau0_(ptf.tau0_)
-{}
-
-
-Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
-(
-    const fixedShearStressFvPatchVectorField& ptf
-)
-:
-    fixedValueFvPatchVectorField(ptf),
-    phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_),
-    tau0_(ptf.tau0_)
-{}
-
-
-Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
-(
-    const fixedShearStressFvPatchVectorField& ptf,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchVectorField(ptf, iF),
-    phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_),
-    tau0_(ptf.tau0_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::fixedShearStressFvPatchVectorField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const label patchI = patch().index();
-
-    const surfaceScalarField& phi =
-        db().lookupObject<surfaceScalarField>(phiName_);
-
-    scalarField nuEff;
-    if (phi.dimensions() == dimVelocity*dimArea)
-    {
-        const incompressible::turbulenceModel& turbModel =
-            db().lookupObject<incompressible::turbulenceModel>
-            (
-                "turbulenceModel"
-            );
-
-        nuEff = turbModel.nuEff()()[patchI];
-    }
-    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
-    {
-        const compressible::turbulenceModel& turbModel =
-            db().lookupObject<compressible::turbulenceModel>
-            (
-                "turbulenceModel"
-            );
-
-        const fvPatchField<scalar>& rhop =
-            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
-
-        nuEff = turbModel.muEff()()[patchI]/rhop;
-    }
-    else
-    {
-        FatalErrorIn("fixedShearStressFvPatchVectorField::updateCoeffs()")
-            << "dimensions of phi are not correct"
-            << "\n    on patch " << this->patch().name()
-            << " of field " << this->dimensionedInternalField().name()
-            << " in file " << this->dimensionedInternalField().objectPath()
-            << exit(FatalError);
-    }
-
-    const vectorField Uc(patchInternalField());
-
-    vector tauHat = tau0_/(mag(tau0_) + ROOTVSMALL);
-
-    const scalarField& ry = patch().deltaCoeffs();
-
-    operator==(tauHat*(tauHat & (tau0_*(1.0/(ry*nuEff)) + Uc)));
-
-    fixedValueFvPatchVectorField::updateCoeffs();
-}
-
-
-void Foam::fixedShearStressFvPatchVectorField::write(Ostream& os) const
-{
-    fixedValueFvPatchVectorField::write(os);
-    writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
-    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    os.writeKeyword("tau") << tau0_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makePatchTypeField
-    (
-        fvPatchVectorField,
-        fixedShearStressFvPatchVectorField
-    );
-}
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H b/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H
deleted file mode 100644
index a399ff07e..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H
+++ /dev/null
@@ -1,154 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-Class
-    Foam::fixedShearStressFvPatchVectorField
-
-Group
-    grpWallBoundaryConditions
-
-Description
-    Set a constant shear stress as tau0 = -nuEff dU/dn.
-
-SourceFiles
-    fixedShearStressFvPatchVectorField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef fixedShearStressFvPatchVectorField_H
-#define fixedShearStressFvPatchVectorField_H
-
-#include "fvPatchFields.H"
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-            Class fixedShearStressFvPatchVectorField Declaration
-\*---------------------------------------------------------------------------*/
-
-class fixedShearStressFvPatchVectorField
-:
-    public fixedValueFvPatchVectorField
-{
-    // Private data
-
-        //- Name of flux field (default = phi)
-        const word phiName_;
-
-        //- Name of density field (default = rho)
-        const word rhoName_;
-
-        //- Constant shear stress
-        const vector tau0_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("fixedShearStress");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        fixedShearStressFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        fixedShearStressFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        fixedShearStressFvPatchVectorField
-        (
-            const fixedShearStressFvPatchVectorField&,
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        fixedShearStressFvPatchVectorField
-        (
-            const fixedShearStressFvPatchVectorField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new fixedShearStressFvPatchVectorField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        fixedShearStressFvPatchVectorField
-        (
-            const fixedShearStressFvPatchVectorField&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchVectorField> clone
-        (
-            const DimensionedField<vector, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new fixedShearStressFvPatchVectorField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
deleted file mode 100644
index afd43395b..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "porousBafflePressureFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::porousBafflePressureFvPatchField<Type>::porousBafflePressureFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    fixedJumpFvPatchField<Type>(p, iF),
-    D_(0),
-    I_(0),
-    length_(0)
-{}
-
-
-template<class Type>
-Foam::porousBafflePressureFvPatchField<Type>::porousBafflePressureFvPatchField
-(
-    const porousBafflePressureFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedJumpFvPatchField<Type>(ptf, p, iF, mapper),
-    D_(ptf.D_),
-    I_(ptf.I_),
-    length_(ptf.length_)
-{}
-
-
-template<class Type>
-Foam::porousBafflePressureFvPatchField<Type>::porousBafflePressureFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedJumpFvPatchField<Type>(p, iF),
-    D_(readScalar(dict.lookup("D"))),
-    I_(readScalar(dict.lookup("I"))),
-    length_(readScalar(dict.lookup("length")))
-{
-    fvPatchField<Type>::operator=
-    (
-        Field<Type>("value", dict, p.size())
-    );
-}
-
-
-template<class Type>
-Foam::porousBafflePressureFvPatchField<Type>::porousBafflePressureFvPatchField
-(
-    const porousBafflePressureFvPatchField<Type>& ptf
-)
-:
-    cyclicLduInterfaceField(),
-    fixedJumpFvPatchField<Type>(ptf),
-    D_(ptf.D_),
-    I_(ptf.I_),
-    length_(ptf.length_)
-{}
-
-
-template<class Type>
-Foam::porousBafflePressureFvPatchField<Type>::porousBafflePressureFvPatchField
-(
-    const porousBafflePressureFvPatchField<Type>& ptf,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    fixedJumpFvPatchField<Type>(ptf, iF),
-    D_(ptf.D_),
-    I_(ptf.I_),
-    length_(ptf.length_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-template<class Type>
-void Foam::porousBafflePressureFvPatchField<Type>::write(Ostream& os) const
-{
-    fixedJumpFvPatchField<Type>::write(os);
-    os.writeKeyword("D") << D_ << token::END_STATEMENT << nl;
-    os.writeKeyword("I") << I_ << token::END_STATEMENT << nl;
-    os.writeKeyword("length") << length_ << token::END_STATEMENT << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
deleted file mode 100644
index 520fe0985..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
+++ /dev/null
@@ -1,216 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::porousBafflePressureFvPatchField
-
-Group
-    grpCoupledBoundaryConditions
-
-Description
-    This boundary condition provides a jump condition, using the \c cyclic
-    condition as a base.
-
-    The porous baffle introduces a pressure jump defined by:
-
-        \f[
-            \Delta p = -(D \mu U + 0.5 I \rho |U|^2 )L
-        \f]
-
-    where
-
-    \vartable
-        p      | pressure [Pa]
-        \rho   | density [kg/m3]
-        \mu    | laminar viscosity [Pa s]
-        I      | inertial coefficient
-        D      | Darcy coefficient
-        L      | porous media length in the flow direction
-    \endvartable
-
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        patchType    | underlying patch type should be \c cyclic| yes |
-        D            | Darcy coefficient       | yes         |
-        I            | inertial coefficient    | yes         |
-        L            | porous media length in the flow direction | yes |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            porousBafflePressure;
-        patchType       cyclic;
-        jump            uniform 0;
-        I               1000000;
-        D               0.001;
-        L               0.1;
-        value           uniform 0;
-    }
-    \endverbatim
-
-Note
-     The underlying \c patchType should be set to \c cyclic
-
-SourceFiles
-    porousBafflePressureFvPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef porousBafflePressureFvPatchField_H
-#define porousBafflePressureFvPatchField_H
-
-#include "fixedJumpFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                Class porousBafflePressureFvPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class porousBafflePressureFvPatchField
-:
-    public fixedJumpFvPatchField<Type>
-{
-    // Private data
-
-        //- Darcy pressure loss coefficient
-        scalar D_;
-
-        //- Inertia pressure lost coefficient
-        scalar I_;
-
-        //- Porous media length
-        scalar length_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("porousBafflePressure");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        porousBafflePressureFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        porousBafflePressureFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given porousBafflePressureFvPatchField
-        // onto a new patch
-        porousBafflePressureFvPatchField
-        (
-            const porousBafflePressureFvPatchField<Type>&,
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        porousBafflePressureFvPatchField
-        (
-            const porousBafflePressureFvPatchField<Type>&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new porousBafflePressureFvPatchField<Type>(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        porousBafflePressureFvPatchField
-        (
-            const porousBafflePressureFvPatchField<Type>&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
-        (
-            const DimensionedField<Type, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new porousBafflePressureFvPatchField<Type>(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-//- Specialisation of the jump-condition for the pressure
-template<>
-void porousBafflePressureFvPatchField<scalar>::updateCoeffs();
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "porousBafflePressureFvPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.C b/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.C
deleted file mode 100644
index 6f218bd8c..000000000
--- a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.C
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "porousBafflePressureFvPatchFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-
-#include "compressible/turbulenceModel/turbulenceModel.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeTemplatePatchTypeField
-(
-    fvPatchScalarField,
-    porousBafflePressureFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-//- Specialisation of the jump-condition for the pressure
-template<>
-void Foam::porousBafflePressureFvPatchField<Foam::scalar>::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const label patchI = patch().index();
-
-    const surfaceScalarField& phi =
-            db().lookupObject<surfaceScalarField>("phi");
-
-    const fvsPatchField<scalar>& phip =
-        patch().patchField<surfaceScalarField, scalar>(phi);
-
-    scalarField Un(phip/patch().magSf());
-
-    scalarField magUn(mag(Un));
-
-    if (phi.dimensions() == dimensionSet(0, 3, -1, 0, 0))
-    {
-        const incompressible::turbulenceModel& turbModel =
-            db().lookupObject<incompressible::turbulenceModel>
-            (
-                "turbulenceModel"
-            );
-
-        const scalarField nu = turbModel.nu()().boundaryField()[patchI];
-
-        jump_ = -sign(Un)*(D_*nu + I_*0.5*magUn)*magUn*length_;
-    }
-    else
-    {
-        const compressible::turbulenceModel& turbModel =
-            db().lookupObject<compressible::turbulenceModel>
-            (
-                "turbulenceModel"
-            );
-
-        const scalarField mu = turbModel.mu().boundaryField()[patchI];
-
-        const scalarField rhow =
-            patch().lookupPatchField<volScalarField, scalar>("rho");
-
-        Un /= rhow;
-
-        jump_ = -sign(Un)*(D_*mu + I_*0.5*rhow*magUn)*magUn*length_;
-    }
-
-    if (debug)
-    {
-        scalar avePressureJump = gAverage(jump_);
-        scalar aveVelocity = gAverage(mag(Un));
-
-        Info<< patch().boundaryMesh().mesh().name() << ':'
-            << patch().name() << ':'
-            << " Average pressure drop :" << avePressureJump
-            << " Average velocity :" << aveVelocity
-            << endl;
-    }
-
-    fixedJumpFvPatchField<scalar>::updateCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/Allwmake b/src/turbulenceModels/incompressible/Allwmake
deleted file mode 100755
index ec2033465..000000000
--- a/src/turbulenceModels/incompressible/Allwmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-targetType=libso
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-set -x
-
-wmake $targetType turbulenceModel
-wmake $targetType RAS
-wmake $targetType LES
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C b/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C
deleted file mode 100644
index 2f3e33931..000000000
--- a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
-
-DESModel::DESModel
-(
-    const word& type,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-:
-    LESModel(type, U, phi, transport, turbulenceModelName)
-
-{}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/DESModel/DESModelDoc.H b/src/turbulenceModels/incompressible/LES/DESModel/DESModelDoc.H
deleted file mode 100644
index 5311d09d6..000000000
--- a/src/turbulenceModels/incompressible/LES/DESModel/DESModelDoc.H
+++ /dev/null
@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpIcoDESTurbulence Incompressible DES turbulence
-@{
-    \ingroup grpIcoTurbulence
-    This group contains incompressible DES models.
-@}
-    
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
deleted file mode 100644
index af3c7eb0a..000000000
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ /dev/null
@@ -1,162 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "DeardorffDiffStress.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(DeardorffDiffStress, 0);
-addToRunTimeSelectionTable(LESModel, DeardorffDiffStress, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void DeardorffDiffStress::updateSubGridScaleFields(const volScalarField& K)
-{
-    nuSgs_ = ck_*sqrt(K)*delta();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-DeardorffDiffStress::DeardorffDiffStress
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenSGSStress(U, phi, transport),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.094
-        )
-    ),
-    cm_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cm",
-            coeffDict_,
-            4.13
-        )
-    )
-{
-    updateSubGridScaleFields(0.5*tr(B_));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenSGSStress::correct(gradU);
-
-    const volSymmTensorField D(symm(gradU));
-
-    const volSymmTensorField P(-twoSymm(B_ & gradU));
-
-    volScalarField K(0.5*tr(B_));
-    volScalarField Epsilon(2*nuEff()*magSqr(D));
-
-    tmp<fvSymmTensorMatrix> BEqn
-    (
-        fvm::ddt(B_)
-      + fvm::div(phi(), B_)
-      - fvm::laplacian(DBEff(), B_)
-      + fvm::Sp(cm_*sqrt(K)/delta(), B_)
-     ==
-        P
-      + 0.8*K*D
-      - (2*ce_ - 0.667*cm_)*I*Epsilon
-    );
-
-    BEqn().relax();
-    BEqn().solve();
-
-    // Bounding the component kinetic energies
-
-    forAll(B_, celli)
-    {
-        B_[celli].component(symmTensor::XX) =
-            max(B_[celli].component(symmTensor::XX), kMin_.value());
-        B_[celli].component(symmTensor::YY) =
-            max(B_[celli].component(symmTensor::YY), kMin_.value());
-        B_[celli].component(symmTensor::ZZ) =
-            max(B_[celli].component(symmTensor::ZZ), kMin_.value());
-    }
-
-    K = 0.5*tr(B_);
-    bound(K, kMin_);
-
-    updateSubGridScaleFields(K);
-}
-
-
-bool DeardorffDiffStress::read()
-{
-    if (GenSGSStress::read())
-    {
-        ck_.readIfPresent(coeffDict());
-        cm_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
deleted file mode 100644
index 7125d3be0..000000000
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ /dev/null
@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::DeardorffDiffStress
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    Differential SGS Stress Equation Model for incompressible flows
-
-    The DSEM uses a model version of the full balance equation for the SGS
-    stress tensor to simulate the behaviour of B.
-    Thus,
-        \f[
-            \frac{d}{dt}(B) + \nabla\cdot(U B) - \nabla\cdot(\nu_{sgs}\nabla B)
-          =
-            P - c_1 \frac{\epsilon}{k}B - 0.667(1 - c_1)\epsilon I
-            - c_2 (P - 0.333 trP I)
-        \f]
-
-    where
-    \f{eqnarray*}{
-        k          &=& 0.5 tr(B)                \\
-        \epsilon   &=& c_e k^{3/2}/\Delta       \\
-        \epsilon/k &=& c_e k^{1/2}/\Delta       \\
-        P          &=& -(B'L + L'B)             \\
-        \nu_{sgs}  &=& c_k k^{1/2} \Delta       \\
-        \nu_{eff}  &=& \nu_{sgs} + \nu
-    \f}
-
-SourceFiles
-    DeardorffDiffStress.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef DeardorffDiffStress_H
-#define DeardorffDiffStress_H
-
-#include "GenSGSStress.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class DeardorffDiffStress Declaration
-\*---------------------------------------------------------------------------*/
-
-class DeardorffDiffStress
-:
-    public GenSGSStress
-{
-    // Private data
-
-        dimensionedScalar ck_;
-        dimensionedScalar cm_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volScalarField& K);
-
-        // Disallow default bitwise copy construct and assignment
-        DeardorffDiffStress(const DeardorffDiffStress&);
-        DeardorffDiffStress& operator=(const DeardorffDiffStress&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("DeardorffDiffStress");
-
-    // Constructors
-
-        //- Construct from components
-        DeardorffDiffStress
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~DeardorffDiffStress()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for B
-        tmp<volScalarField> DBEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DBEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
deleted file mode 100644
index 1dcad692c..000000000
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ /dev/null
@@ -1,149 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameWithName(GenEddyVisc, "GenEddyVisc");
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-GenEddyVisc::GenEddyVisc
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-
-    ce_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ce",
-            coeffDict_,
-            1.048
-        )
-    ),
-
-    nuSgs_
-    (
-        IOobject
-        (
-            "nuSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    )
-{
-//    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> GenEddyVisc::B() const
-{
-    return ((2.0/3.0)*I)*k() - nuSgs_*twoSymm(fvc::grad(U()));
-}
-
-
-tmp<volSymmTensorField> GenEddyVisc::devReff() const
-{
-    return -nuEff()*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<fvVectorMatrix> GenEddyVisc::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> GenEddyVisc::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-void GenEddyVisc::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-}
-
-
-bool GenEddyVisc::read()
-{
-    if (LESModel::read())
-    {
-        ce_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
deleted file mode 100644
index ab57b4cd8..000000000
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
+++ /dev/null
@@ -1,170 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::GenEddyVisc
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    General base class for all incompressible models that can be implemented
-    as an eddy viscosity, i.e. algebraic and one-equation models.
-
-    Contains fields for k (SGS turbulent kinetic energy), gamma
-    (modelled viscosity) and epsilon (SGS dissipation).
-
-SourceFiles
-    GenEddyVisc.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef GenEddyVisc_H
-#define GenEddyVisc_H
-
-#include "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class GenEddyVisc Declaration
-\*---------------------------------------------------------------------------*/
-
-class GenEddyVisc
-:
-    virtual public LESModel
-{
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        GenEddyVisc(const GenEddyVisc&);
-        GenEddyVisc& operator=(const GenEddyVisc&);
-
-
-protected:
-
-    // Model coefficients
-
-        dimensionedScalar ce_;
-
-    // Fields
-
-        volScalarField nuSgs_;
-
-
-public:
-
-    //- Partial Runtime type information
-    static const word typeName;
-
-    // Constructors
-
-        //- Construct from components
-        GenEddyVisc
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~GenEddyVisc()
-    {}
-
-
-    // Member Functions
-
-        //- Return sub-grid disipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (   
-                        "epsilon",
-                        runTime_.timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    ce_*k()*sqrt(k())/delta()
-                )
-            );
-        }
-
-        //- Return the SGS viscosity.
-        virtual tmp<volScalarField> nuSgs() const
-        {
-            return nuSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
deleted file mode 100644
index d44bb7e38..000000000
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
+++ /dev/null
@@ -1,230 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "GenSGSStress.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameWithName(GenSGSStress, "GenSGSStress");
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-GenSGSStress::GenSGSStress
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-
-    ce_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ce",
-            coeffDict_,
-            1.048
-        )
-    ),
-
-    couplingFactor_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "couplingFactor",
-            coeffDict_,
-            0.0
-        )
-    ),
-
-    B_
-    (
-        IOobject
-        (
-            "B",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    nuSgs_
-    (
-        IOobject
-        (
-            "nuSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        nu(),
-        B_.boundaryField().types()
-    )
-{
-    if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-    {
-        FatalErrorIn
-        (
-            "GenSGSStress::GenSGSStress"
-            "(const volVectorField& U, const surfaceScalarField& phi,"
-            "transportModel& transport)"
-        )   << "couplingFactor = " << couplingFactor_
-            << " is not in range 0 - 1" << nl
-            << exit(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> GenSGSStress::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            B_ - nu()*dev(twoSymm(fvc::grad(U())))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> GenSGSStress::divDevReff
-(
-    volVectorField& U
-) const
-{
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div(B_ + couplingFactor_*nuSgs_*fvc::grad(U))
-          + fvc::laplacian
-            (
-                (1.0 - couplingFactor_)*nuSgs_, U, "laplacian(nuEff,U)"
-            )
-          - fvm::laplacian(nuEff(), U)
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(B_)
-          + fvc::laplacian(nuSgs_, U, "laplacian(nuEff,U)")
-          - fvm::laplacian(nuEff(), U)
-        );
-    }
-}
-
-
-tmp<fvVectorMatrix> GenSGSStress::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div(rho*B_ + couplingFactor_*rho*nuSgs_*fvc::grad(U))
-          + fvc::laplacian
-            (
-                (1.0 - couplingFactor_)*rho*nuSgs_, U, "laplacian(muEff,U)"
-            )
-          - fvm::laplacian(muEff, U)
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(rho*B_)
-          + fvc::laplacian(rho*nuSgs_, U, "laplacian(muEff,U)")
-          - fvm::laplacian(muEff, U)
-        );
-    }
-}
-
-
-bool GenSGSStress::read()
-{
-    if (LESModel::read())
-    {
-        ce_.readIfPresent(coeffDict());
-
-        couplingFactor_.readIfPresent(coeffDict());
-
-        if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-        {
-            FatalErrorIn("GenSGSStress::read()")
-                << "couplingFactor = " << couplingFactor_
-                << " is not in range 0 - 1"
-                << exit(FatalError);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
deleted file mode 100644
index da2b356a8..000000000
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
+++ /dev/null
@@ -1,192 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::GenSGSStress
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    General base class for all incompressible models that directly
-    solve for the SGS stress tensor B.
-
-    Contains tensor fields B (the SGS stress tensor) as well as scalar
-    fields for k (SGS turbulent energy) gamma (SGS viscosity) and epsilon
-    (SGS dissipation).
-
-SourceFiles
-    GenSGSStress.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef GenSGSStress_H
-#define GenSGSStress_H
-
-#include "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class GenSGSStress Declaration
-\*---------------------------------------------------------------------------*/
-
-class GenSGSStress
-:
-    virtual public LESModel
-{
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        GenSGSStress(const GenSGSStress&);
-        GenSGSStress& operator=(const GenSGSStress&);
-
-
-protected:
-
-        dimensionedScalar ce_;
-
-        dimensionedScalar couplingFactor_;
-
-        volSymmTensorField B_;
-        volScalarField nuSgs_;
-
-
-public:
-
-    //- Partial Runtime type information
-    static const word typeName;
-
-    // Constructors
-
-        //- Construct from components
-        GenSGSStress
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~GenSGSStress()
-    {}
-
-
-    // Member Functions
-
-        //- Return the SGS turbulent kinetic energy.
-        virtual tmp<volScalarField> k() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (   
-                        "k",
-                        runTime_.timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    0.5*tr(B_)
-                )
-            );
-        }
-
-        //- Return the SGS turbulent dissipation.
-        virtual tmp<volScalarField> epsilon() const
-        {
-            const volScalarField K(k());
-            
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (   
-                        "epsilon",
-                        runTime_.timeName(),
-                        mesh_,
-                        IOobject::NO_READ,
-                        IOobject::NO_WRITE
-                    ),
-                    ce_*K*sqrt(K)/delta()
-                )
-            );
-        }
-
-        //- Return the SGS viscosity.
-        virtual tmp<volScalarField> nuSgs() const
-        {
-            return nuSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const
-        {
-            return B_;
-        }
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
deleted file mode 100644
index 5486b5592..000000000
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ /dev/null
@@ -1,207 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LESModel.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LESModel, 0);
-defineRunTimeSelectionTable(LESModel, dictionary);
-addToRunTimeSelectionTable(turbulenceModel, LESModel, turbulenceModel);
-
-// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
-
-void LESModel::printCoeffs()
-{
-    if (printCoeffs_)
-    {
-        Info<< type() << "Coeffs" << coeffDict_ << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
-
-LESModel::LESModel
-(
-    const word& type,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-:
-    turbulenceModel(U, phi, transport, turbulenceModelName),
-
-    IOdictionary
-    (
-        IOobject
-        (
-            "LESProperties",
-            U.time().constant(),
-            U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    ),
-
-    printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subOrEmptyDict(type + "Coeffs")),
-
-    kMin_("kMin", sqr(dimVelocity), SMALL),
-    delta_(LESdelta::New("delta", U.mesh(), *this))
-{
-    kMin_.readIfPresent(*this);
-
-    // Force the construction of the mesh deltaCoeffs which may be needed
-    // for the construction of the derived models and BCs
-    mesh_.deltaCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<LESModel> LESModel::New
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "LESProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("LESModel")
-    );
-
-    Info<< "Selecting LES turbulence model " << modelType << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESModel::New"
-            "("
-                "const volVectorField&, "
-                "const surfaceScalarField& ,"
-                "transportModel&, "
-                "const word&"
-            ")"
-        )   << "Unknown LESModel type "
-            << modelType << nl << nl
-            << "Valid LESModel types:" << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESModel>
-    (
-        cstrIter()(U, phi, transport, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void LESModel::correct(const tmp<volTensorField>&)
-{
-    turbulenceModel::correct();
-    delta_().correct();
-}
-
-
-void LESModel::correct()
-{
-    correct(fvc::grad(U_));
-}
-
-
-bool LESModel::read()
-{
-    //if (regIOobject::read())
-
-    // Bit of trickery : we are both IOdictionary ('RASProperties') and
-    // an regIOobject from the turbulenceModel level. Problem is to distinguish
-    // between the two - we only want to reread the IOdictionary.
-
-    bool ok = IOdictionary::readData
-    (
-        IOdictionary::readStream
-        (
-            IOdictionary::type()
-        )
-    );
-    IOdictionary::close();
-
-    if (ok)
-    {
-        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
-        {
-            coeffDict_ <<= *dictPtr;
-        }
-
-        delta_().read(*this);
-
-        kMin_.readIfPresent(*this);
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
deleted file mode 100644
index 8dad795f6..000000000
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ /dev/null
@@ -1,246 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Namespace
-    Foam::incompressible::LESModels
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    Namespace for incompressible LES models.
-
-Class
-    Foam::incompressible::LESModel
-
-Description
-    Base class for all incompressible flow LES SGS models.
-
-    This class defines the basic interface for an incompressible flow SGS
-    model, and encapsulates data of value to all possible models.
-    In particular this includes references to all the dependent fields
-    (U, phi), the physical viscosity nu, and the LESProperties
-    dictionary, which contains the model selection and model coefficients.
-
-SourceFiles
-    LESModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef incompressibleLESModel_H
-#define incompressibleLESModel_H
-
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H"
-#include "fvm.H"
-#include "fvc.H"
-#include "fvMatrices.H"
-#include "incompressible/transportModel/transportModel.H"
-#include "bound.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LESModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class LESModel
-:
-    public turbulenceModel,
-    public IOdictionary
-{
-
-protected:
-
-    // Protected data
-
-        Switch printCoeffs_;
-        dictionary coeffDict_;
-
-        dimensionedScalar kMin_;
-
-        autoPtr<Foam::LESdelta> delta_;
-
-
-    // Protected Member Functions
-
-        //- Print model coefficients
-        virtual void printCoeffs();
-
-
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        LESModel(const LESModel&);
-
-        //- Disallow default bitwise assignment
-        LESModel& operator=(const LESModel&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LESModel");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            LESModel,
-            dictionary,
-            (
-                const volVectorField& U,
-                const surfaceScalarField& phi,
-                const transportModel& transport,
-                const word& turbulenceModelName
-            ),
-            (U, phi, transport, turbulenceModelName)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        LESModel
-        (
-            const word& type,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected LES model
-        static autoPtr<LESModel> New
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    //- Destructor
-    virtual ~LESModel()
-    {}
-
-
-    // Member Functions
-
-        // Access
-
-            //- Const access to the coefficients dictionary,
-            //  which provides info. about choice of models,
-            //  and all related data (particularly model coefficients).
-            virtual const dictionary& coeffDict() const
-            {
-                return coeffDict_;
-            }
-
-            //- Return the lower allowable limit for k (default: SMALL)
-            const dimensionedScalar& kMin() const
-            {
-                return kMin_;
-            }
-
-            //- Allow kMin to be changed
-            dimensionedScalar& kMin()
-            {
-                return kMin_;
-            }
-
-            //- Access function to filter width
-            virtual const volScalarField& delta() const
-            {
-                return delta_();
-            }
-
-
-        //- Return the SGS viscosity.
-        virtual tmp<volScalarField> nuSgs() const = 0;
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> nuEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("nuEff", nuSgs() + nu())
-            );
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const = 0;
-
-
-        // RAS compatibility functions for the turbulenceModel base class
-
-            //- Return the turbulence viscosity
-            virtual tmp<volScalarField> nut() const
-            {
-                return nuSgs();
-            }
-
-            //- Return the Reynolds stress tensor
-            virtual tmp<volSymmTensorField> R() const
-            {
-                return B();
-            }
-
-
-        //- Correct Eddy-Viscosity and related properties.
-        //  This calls correct(const tmp<volTensorField>& gradU) by supplying
-        //  gradU calculated locally.
-        virtual void correct();
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModelDoc.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModelDoc.H
deleted file mode 100644
index 9b400e23e..000000000
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModelDoc.H
+++ /dev/null
@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpIcoLESTurbulence Incompressible LES turbulence
-@{
-    \ingroup grpIcoTurbulence
-    This group contains incompressible LES models.
-@}
-    
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
deleted file mode 100644
index 5fda184be..000000000
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LRRDiffStress.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LRRDiffStress, 0);
-addToRunTimeSelectionTable(LESModel, LRRDiffStress, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void LRRDiffStress::updateSubGridScaleFields(const volScalarField& K)
-{
-    nuSgs_ = ck_*sqrt(K)*delta();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LRRDiffStress::LRRDiffStress
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenSGSStress(U, phi, transport),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.09
-        )
-    ),
-    c1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "c1",
-            coeffDict_,
-            1.8
-        )
-    ),
-    c2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "c2",
-            coeffDict_,
-            0.6
-        )
-    )
-{
-    volScalarField K(0.5*tr(B_));
-    bound(K, kMin_);
-
-    updateSubGridScaleFields(K);
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void LRRDiffStress::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenSGSStress::correct(gradU);
-
-    const volSymmTensorField D(symm(gradU));
-
-    const volSymmTensorField P(-twoSymm(B_ & gradU));
-
-    volScalarField K(0.5*tr(B_));
-    const volScalarField Epsilon(2*nuEff()*magSqr(D));
-
-    tmp<fvSymmTensorMatrix> BEqn
-    (
-        fvm::ddt(B_)
-      + fvm::div(phi(), B_)
-      - fvm::laplacian(DBEff(), B_)
-      + fvm::Sp(c1_*Epsilon/K, B_)
-     ==
-        P
-      - (0.667*(1.0 - c1_)*I)*Epsilon
-      - c2_*(P - 0.333*I*tr(P))
-      - (0.667 - 2*c1_)*I*pow(K, 1.5)/delta()
-    );
-
-    BEqn().relax();
-    BEqn().solve();
-
-    // Bounding the component kinetic energies
-
-    forAll(B_, celli)
-    {
-        B_[celli].component(symmTensor::XX) =
-            max(B_[celli].component(symmTensor::XX), kMin_.value());
-        B_[celli].component(symmTensor::YY) =
-            max(B_[celli].component(symmTensor::YY), kMin_.value());
-        B_[celli].component(symmTensor::ZZ) =
-            max(B_[celli].component(symmTensor::ZZ), kMin_.value());
-    }
-
-    K = 0.5*tr(B_);
-    bound(K, kMin_);
-
-    updateSubGridScaleFields(K);
-}
-
-
-bool LRRDiffStress::read()
-{
-    if (GenSGSStress::read())
-    {
-        ck_.readIfPresent(coeffDict());
-        c1_.readIfPresent(coeffDict());
-        c2_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
deleted file mode 100644
index a5168b4bf..000000000
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
+++ /dev/null
@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::LRRDiffStress
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    Differential SGS Stress Equation Model for incompressible flows.
-
-    The DSEM uses a model version of the full balance equation for the SGS
-    stress tensor to simulate the behaviour of B, hence,
-    \verbatim
-        d/dt(B) + div(U*B) - div(nuSgs*grad(B))
-        =
-        P - c1*e/k*B - 0.667*(1 - c1)*e*I - c2*(P - 0.333*trP*I)
-    where
-        k = 0.5*trB,
-        epsilon = ce*k^3/2/delta
-        epsilon/k = ce*k^1/2/delta
-        P = -(B'L + L'B)
-        nuEff = ck*sqrt(k)*delta + nu
-    \endverbatim
-
-    This version from Launder, Rece & Rodi 1975
-
-SourceFiles
-    LRRDiffStress.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LRRDiffStress_H
-#define LRRDiffStress_H
-
-#include "GenSGSStress.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LRRDiffStress Declaration
-\*---------------------------------------------------------------------------*/
-
-class LRRDiffStress
-:
-    public GenSGSStress
-{
-    // Private data
-
-        dimensionedScalar ck_;
-        dimensionedScalar c1_;
-        dimensionedScalar c2_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volScalarField& K);
-
-        // Disallow default bitwise copy construct and assignment
-        LRRDiffStress(const LRRDiffStress&);
-        LRRDiffStress& operator=(const LRRDiffStress&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LRRDiffStress");
-
-    // Constructors
-
-        //- Construct from components
-        LRRDiffStress
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~LRRDiffStress()
-    {}
-
-
-    // Member Functions
-
-        //- Return the effective diffusivity for B
-        tmp<volScalarField> DBEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DBEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/Make/files b/src/turbulenceModels/incompressible/LES/Make/files
deleted file mode 100644
index 6d4e3cb4d..000000000
--- a/src/turbulenceModels/incompressible/LES/Make/files
+++ /dev/null
@@ -1,34 +0,0 @@
-incompressibleLESdelta/incompressibleLESdelta.C
-vanDriestDelta/vanDriestDelta.C
-
-LESModel/LESModel.C
-
-DESModel/DESModel.C
-
-GenEddyVisc/GenEddyVisc.C
-GenSGSStress/GenSGSStress.C
-
-laminar/laminar.C
-SpalartAllmaras/SpalartAllmaras.C
-SpalartAllmarasDDES/SpalartAllmarasDDES.C
-SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
-SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
-
-oneEqEddy/oneEqEddy.C
-homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
-dynOneEqEddy/dynOneEqEddy.C
-Smagorinsky/Smagorinsky.C
-homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
-LRRDiffStress/LRRDiffStress.C
-DeardorffDiffStress/DeardorffDiffStress.C
-spectEddyVisc/spectEddyVisc.C
-dynLagrangian/dynLagrangian.C
-
-scaleSimilarity/scaleSimilarity.C
-mixedSmagorinsky/mixedSmagorinsky.C
-
-/*Smagorinsky2/Smagorinsky2.C*/
-
-kOmegaSSTSAS/kOmegaSSTSAS.C
-
-LIB = $(FOAM_LIBBIN)/libincompressibleLESModels
diff --git a/src/turbulenceModels/incompressible/LES/Make/options b/src/turbulenceModels/incompressible/LES/Make/options
deleted file mode 100644
index 2699300b5..000000000
--- a/src/turbulenceModels/incompressible/LES/Make/options
+++ /dev/null
@@ -1,14 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESfilters/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -lincompressibleTurbulenceModel \
-    -lLESdeltas \
-    -lLESfilters\
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
deleted file mode 100644
index 9ac283cb5..000000000
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
+++ /dev/null
@@ -1,112 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Smagorinsky.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(Smagorinsky, 0);
-addToRunTimeSelectionTable(LESModel, Smagorinsky, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Smagorinsky::updateSubGridScaleFields(const volTensorField& gradU)
-{
-    nuSgs_ = ck_*delta()*sqrt(k(gradU));
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Smagorinsky::Smagorinsky
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.094
-        )
-    )
-{
-    updateSubGridScaleFields(fvc::grad(U));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Smagorinsky::correct(const tmp<volTensorField>& gradU)
-{
-    GenEddyVisc::correct(gradU);
-    updateSubGridScaleFields(gradU());
-}
-
-
-bool Smagorinsky::read()
-{
-    if (GenEddyVisc::read())
-    {
-        ck_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
deleted file mode 100644
index d2eea980f..000000000
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
+++ /dev/null
@@ -1,147 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::Smagorinsky
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    The Isochoric Smagorinsky Model for incompressible flows.
-
-    Algebraic eddy viscosity SGS model founded on the assumption that
-    local equilibrium prevails.
-    Thus,
-    \verbatim
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        k = (2*ck/ce)*delta^2*||D||^2
-        nuSgs = ck*sqrt(k)*delta
-        nuEff = nuSgs + nu
-    \endverbatim
-
-SourceFiles
-    Smagorinsky.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef Smagorinsky_H
-#define Smagorinsky_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class Smagorinsky Declaration
-\*---------------------------------------------------------------------------*/
-
-class Smagorinsky
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        dimensionedScalar ck_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volTensorField& gradU);
-
-        // Disallow default bitwise copy construct and assignment
-        Smagorinsky(const Smagorinsky&);
-        Smagorinsky& operator=(const Smagorinsky&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("Smagorinsky");
-
-    // Constructors
-
-        //- Construct from components
-        Smagorinsky
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~Smagorinsky()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        //  calculated from the given velocity gradient
-        tmp<volScalarField> k(const tmp<volTensorField>& gradU) const
-        {
-            return (2.0*ck_/ce_)*sqr(delta())*magSqr(dev(symm(gradU)));
-        }
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k(fvc::grad(U()));
-        }
-
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
deleted file mode 100644
index 7564c6c1e..000000000
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
+++ /dev/null
@@ -1,147 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Smagorinsky2.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(Smagorinsky2, 0);
-addToRunTimeSelectionTable(LESModel, Smagorinsky2, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Smagorinsky2::Smagorinsky2
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    Smagorinsky(U, phi, transport),
-
-    cD2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cD2",
-            coeffDict_,
-            0.02
-        )
-    )
-{
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// Evaluate B (from the definition of an eddy viscosity model) and
-// return it.
-
-tmp<volSymmTensorField> Smagorinsky2::B() const
-{
-    volSymmTensorField D(dev(symm(fvc::grad(U()))));
-
-    return (((2.0/3.0)*I)*k() - 2.0*nuSgs_*D - (2.0*cD2_)*delta()*(D&D));
-}
-
-
-tmp<fvVectorMatrix> Smagorinsky2::divDevReff
-(
-    volVectorField& U
-) const
-{
-    volTensorField gradU(fvc::grad(U));
-
-    volSymmTensorField aniNuEff
-    (
-        "aniNuEff",
-        I*nuEff() + cD2_*delta()*symm(gradU)
-    );
-
-    return
-    (
-      - fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> Smagorinsky2::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volTensorField gradU(fvc::grad(U));
-
-    volSymmTensorField aniMuEff
-    (
-        "muEff",
-        I*(rho*nuEff()) + (cD2_*rho*delta())*symm(gradU)
-    );
-
-    return
-    (
-      - fvm::laplacian(aniMuEff, U)
-      - fvc::div(rho*nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool Smagorinsky2::read()
-{
-    if (Smagorinsky::read())
-    {
-        cD2.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
deleted file mode 100644
index 9b5414d20..000000000
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ /dev/null
@@ -1,463 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "SpalartAllmaras.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void SpalartAllmaras::updateSubGridScaleFields()
-{
-    nuSgs_.internalField() = fv1()*nuTilda_.internalField();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<volScalarField> SpalartAllmaras::fv1() const
-{
-    const volScalarField chi3("chi3", pow3(nuTilda_/nu()));
-    return chi3/(chi3 + pow3(Cv1_));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv2() const
-{
-    if (ashfordCorrection_)
-    {
-        return 1/pow3(scalar(1) + nuTilda_/(Cv2_*nu()));
-    }
-    else
-    {
-        const volScalarField chi("chi", nuTilda_/nu());
-        return 1.0 - chi/(1.0 + chi*fv1());
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv3() const
-{
-    if (ashfordCorrection_)
-    {
-        const volScalarField chi("chi", nuTilda_/nu());
-        const volScalarField chiByCv2(chi/Cv2_);
-
-        return
-            (scalar(1) + chi*fv1())
-           *(1/Cv2_)
-           *(3*(scalar(1) + chiByCv2) + sqr(chiByCv2))
-           /pow3(scalar(1) + chiByCv2);
-    }
-    else
-    {
-        return tmp<volScalarField>
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    "fv3",
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                mesh_,
-                dimensionedScalar("fv3", dimless, 1),
-                zeroGradientFvPatchScalarField::typeName
-            )
-        );
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::S(const volTensorField& gradU) const
-{
-    return sqrt(2.0)*mag(skew(gradU));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::STilda
-(
-    const volScalarField& S,
-    const volScalarField& dTilda
-) const
-{
-    return fv3()*S + fv2()*nuTilda_/sqr(kappa_*dTilda);
-}
-
-
-tmp<volScalarField> SpalartAllmaras::r
-(
-    const volScalarField& visc,
-    const volScalarField& S,
-    const volScalarField& dTilda
-) const
-{
-    return min
-    (
-        visc
-       /(
-           max
-           (
-               S,
-               dimensionedScalar("SMALL", S.dimensions(), SMALL)
-           )
-          *sqr(kappa_*dTilda)
-         + dimensionedScalar
-           (
-               "ROOTVSMALL",
-               dimensionSet(0, 2 , -1, 0, 0),
-               ROOTVSMALL
-           )
-        ),
-        scalar(10)
-    );
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fw
-(
-    const volScalarField& S,
-    const volScalarField& dTilda
-) const
-{
-    const volScalarField r(this->r(nuTilda_, S, dTilda));
-    const volScalarField g(r + Cw2_*(pow6(r) - r));
-
-    return g*pow((1 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
-}
-
-
-tmp<volScalarField> SpalartAllmaras::dTilda(const volScalarField&) const
-{
-    tmp<volScalarField> tdTilda(CDES_*delta());
-    min(tdTilda().dimensionedInternalField(), tdTilda(), y_);
-    return tdTilda;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-SpalartAllmaras::SpalartAllmaras
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    DESModel(modelName, U, phi, transport, turbulenceModelName),
-
-    sigmaNut_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaNut",
-            coeffDict_,
-            0.66666
-        )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            coeffDict_,
-            0.41
-        )
-    ),
-    Cb1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb1",
-            coeffDict_,
-            0.1355
-        )
-    ),
-    Cb2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb2",
-            coeffDict_,
-            0.622
-        )
-    ),
-    Cv1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv1",
-            coeffDict_,
-            7.1
-        )
-    ),
-    Cv2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv2",
-            coeffDict_,
-            5.0
-        )
-    ),
-    CDES_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "CDES",
-            coeffDict_,
-            0.65
-        )
-    ),
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.07
-        )
-    ),
-    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
-    Cw2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw2",
-            coeffDict_,
-            0.3
-        )
-    ),
-    Cw3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw3",
-            coeffDict_,
-            2.0
-        )
-    ),
-
-    ashfordCorrection_(coeffDict_.lookupOrDefault("ashfordCorrection", true)),
-
-    y_(wallDist::New(mesh_).y()),
-
-    nuTilda_
-    (
-        IOobject
-        (
-            "nuTilda",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    nuSgs_
-    (
-        IOobject
-        (
-            "nuSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    )
-{
-    updateSubGridScaleFields();
-
-    if (ashfordCorrection_)
-    {
-        Info<< "    Employing Ashford correction" << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void SpalartAllmaras::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-
-    const volScalarField S(this->S(gradU));
-    const volScalarField dTilda(this->dTilda(S));
-    const volScalarField STilda(this->STilda(S, dTilda));
-
-    tmp<fvScalarMatrix> nuTildaEqn
-    (
-        fvm::ddt(nuTilda_)
-      + fvm::div(phi(), nuTilda_)
-      - fvm::laplacian
-        (
-            (nuTilda_ + nu())/sigmaNut_,
-            nuTilda_,
-            "laplacian(DnuTildaEff,nuTilda)"
-        )
-      - Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
-     ==
-        Cb1_*STilda*nuTilda_
-      - fvm::Sp(Cw1_*fw(STilda, dTilda)*nuTilda_/sqr(dTilda), nuTilda_)
-    );
-
-    nuTildaEqn().relax();
-    nuTildaEqn().solve();
-
-    bound(nuTilda_, dimensionedScalar("zero", nuTilda_.dimensions(), 0.0));
-    nuTilda_.correctBoundaryConditions();
-
-    updateSubGridScaleFields();
-}
-
-
-tmp<volScalarField> SpalartAllmaras::k() const
-{
-    return sqr(nuSgs()/ck_/dTilda(S(fvc::grad(U()))));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::epsilon() const
-{
-    return 2*nuEff()*magSqr(symm(fvc::grad(U())));
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::B() const
-{
-    return ((2.0/3.0)*I)*k() - nuSgs()*twoSymm(fvc::grad(U()));
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::devReff() const
-{
-    return -nuEff()*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool SpalartAllmaras::read()
-{
-    if (LESModel::read())
-    {
-        sigmaNut_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(*this);
-
-        Cb1_.readIfPresent(coeffDict());
-        Cb2_.readIfPresent(coeffDict());
-        Cv1_.readIfPresent(coeffDict());
-        Cv2_.readIfPresent(coeffDict());
-        CDES_.readIfPresent(coeffDict());
-        ck_.readIfPresent(coeffDict());
-        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
-        Cw2_.readIfPresent(coeffDict());
-        Cw3_.readIfPresent(coeffDict());
-
-        ashfordCorrection_.readIfPresent("ashfordCorrection", coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::LESRegion() const
-{
-    tmp<volScalarField> tLESRegion
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "DES::LESRegion",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            neg(dTilda(S(fvc::grad(U_))) - y_)
-        )
-    );
-
-    return tLESRegion;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
deleted file mode 100644
index 0112352d0..000000000
--- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "dynLagrangian.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dynLagrangian, 0);
-addToRunTimeSelectionTable(LESModel, dynLagrangian, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void dynLagrangian::updateSubGridScaleFields
-(
-    const tmp<volTensorField>& gradU
-)
-{
-    nuSgs_ = (flm_/fmm_)*sqr(delta())*mag(dev(symm(gradU)));
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-dynLagrangian::dynLagrangian
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    flm_
-    (
-        IOobject
-        (
-            "flm",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    fmm_
-    (
-        IOobject
-        (
-            "fmm",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-    theta_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "theta",
-            coeffDict_,
-            1.5
-        )
-    ),
-    simpleFilter_(U.mesh()),
-    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
-    filter_(filterPtr_()),
-    flm0_("flm0", flm_.dimensions(), 0.0),
-    fmm0_("fmm0", fmm_.dimensions(), VSMALL)
-{
-    updateSubGridScaleFields(fvc::grad(U));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void dynLagrangian::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-
-    volSymmTensorField S(dev(symm(gradU())));
-
-    volScalarField magS(mag(S));
-
-    volVectorField Uf(filter_(U()));
-
-    volSymmTensorField Sf(dev(symm(fvc::grad(Uf))));
-
-    volScalarField magSf(mag(Sf));
-
-    volSymmTensorField L(dev(filter_(sqr(U())) - (sqr(filter_(U())))));
-
-    volSymmTensorField M(2.0*sqr(delta())*(filter_(magS*S) - 4.0*magSf*Sf));
-
-    volScalarField invT
-    (
-        (1.0/(theta_.value()*delta()))*pow(flm_*fmm_, 1.0/8.0)
-    );
-
-    volScalarField LM(L && M);
-
-    fvScalarMatrix flmEqn
-    (
-        fvm::ddt(flm_)
-      + fvm::div(phi(), flm_)
-     ==
-        invT*LM
-      - fvm::Sp(invT, flm_)
-    );
-
-    flmEqn.relax();
-    flmEqn.solve();
-
-    bound(flm_, flm0_);
-
-    volScalarField MM(M && M);
-
-    fvScalarMatrix fmmEqn
-    (
-        fvm::ddt(fmm_)
-      + fvm::div(phi(), fmm_)
-     ==
-        invT*MM
-      - fvm::Sp(invT, fmm_)
-    );
-
-    fmmEqn.relax();
-    fmmEqn.solve();
-
-    bound(fmm_, fmm0_);
-
-    updateSubGridScaleFields(gradU);
-}
-
-
-bool dynLagrangian::read()
-{
-    if (GenEddyVisc::read())
-    {
-        filter_.read(coeffDict());
-        theta_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
deleted file mode 100644
index 3500c6880..000000000
--- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
+++ /dev/null
@@ -1,196 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::dynLagrangian
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    Dynamic eddy-viscosity model with Lagrangian averaging for incompressible
-    flow
-
-    \verbatim
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        D = symm(grad(U))
-        nuSgs = (flm/fmm)*delta^2*sqrt(2)*|D|
-        nuEff = nuSgs + nu
-
-        Two relaxation equations are used to evaluate flm and fmm:
-
-        d/dt(flm) + div(U*flm)
-        =
-        (1/T)*(L && M - flm)
-
-        d/dt(fmm) + div(U*fmm)
-        =
-        (1/T)*(M && M - fmm)
-
-    where
-
-        L = F(U.U) - F(U).F(U)
-        M = 2.0 delta^2 (F(|D|.D) - 4 F(|D|).F(D))
-        T = 1.5*delta*(flm.fmm)^(-1.0/8.0)
-
-    \endverbatim
-
-    Reference:
-    \verbatim
-        "A Lagrangian dynamic subgrid-scale model of turbulence"
-        Charles Meneveau,
-        Thomas Lund,
-        William Cabot,
-        J. Fluid Mech (1996), vol 319, pp. 353-385
-    \endverbatim
-
-SourceFiles
-    dynLagrangian.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef dynLagrangian_H
-#define dynLagrangian_H
-
-#include "GenEddyVisc.H"
-#include "simpleFilter.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class dynLagrangian Declaration
-\*---------------------------------------------------------------------------*/
-
-class dynLagrangian
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField flm_;
-        volScalarField fmm_;
-
-        dimensionedScalar theta_;
-
-        simpleFilter simpleFilter_;
-        autoPtr<LESfilter> filterPtr_;
-        LESfilter& filter_;
-
-        dimensionedScalar flm0_;
-        dimensionedScalar fmm0_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields
-        (
-            const tmp<volTensorField>& gradU
-        );
-
-        // Disallow default bitwise copy construct and assignment
-        dynLagrangian(const dynLagrangian&);
-        dynLagrangian& operator=(const dynLagrangian&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("dynLagrangian");
-
-    // Constructors
-
-        //- Construct from components
-        dynLagrangian
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~dynLagrangian()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        tmp<volScalarField> k(const tmp<volTensorField>& gradU) const
-        {
-            return
-                pow(2.0*flm_/fmm_, 2.0/3.0)
-              * pow(ce_, -2.0/3.0)
-              * sqr(delta())*magSqr(dev(symm(gradU)));
-        }
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k(fvc::grad(U()));
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
deleted file mode 100644
index 269a204c5..000000000
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ /dev/null
@@ -1,196 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "dynOneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dynOneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, dynOneEqEddy, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void dynOneEqEddy::updateSubGridScaleFields
-(
-    const volSymmTensorField& D,
-    const volScalarField& KK
-)
-{
-    nuSgs_ = ck(D, KK)*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-volScalarField dynOneEqEddy::ck
-(
-    const volSymmTensorField& D,
-    const volScalarField& KK
-) const
-{
-    const volSymmTensorField LL
-    (
-        simpleFilter_(dev(filter_(sqr(U())) - (sqr(filter_(U())))))
-    );
-
-    const volSymmTensorField MM
-    (
-        simpleFilter_(-2.0*delta()*sqrt(KK)*filter_(D))
-    );
-
-    const volScalarField ck
-    (
-        simpleFilter_(0.5*(LL && MM))
-       /(
-            simpleFilter_(magSqr(MM))
-          + dimensionedScalar("small", sqr(MM.dimensions()), VSMALL)
-        )
-    );
-
-    tmp<volScalarField> tfld = 0.5*(mag(ck) + ck);
-    return tfld();
-}
-
-
-volScalarField dynOneEqEddy::ce
-(
-    const volSymmTensorField& D,
-    const volScalarField& KK
-) const
-{
-    const volScalarField ce
-    (
-        simpleFilter_(nuEff()*(filter_(magSqr(D)) - magSqr(filter_(D))))
-       /simpleFilter_(pow(KK, 1.5)/(2.0*delta()))
-    );
-
-    tmp<volScalarField> tfld = 0.5*(mag(ce) + ce);
-    return tfld();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-dynOneEqEddy::dynOneEqEddy
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    simpleFilter_(U.mesh()),
-    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
-    filter_(filterPtr_())
-{
-    bound(k_, kMin_);
-
-    const volScalarField KK(0.5*(filter_(magSqr(U)) - magSqr(filter_(U))));
-    updateSubGridScaleFields(symm(fvc::grad(U)), KK);
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void dynOneEqEddy::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-
-    const volSymmTensorField D(symm(gradU));
-
-    volScalarField KK(0.5*(filter_(magSqr(U())) - magSqr(filter_(U()))));
-    KK.max(dimensionedScalar("small", KK.dimensions(), SMALL));
-
-    const volScalarField P(2.0*nuSgs_*magSqr(D));
-
-    tmp<fvScalarMatrix> kEqn
-    (
-       fvm::ddt(k_)
-     + fvm::div(phi(), k_)
-     - fvm::laplacian(DkEff(), k_)
-    ==
-       P
-     - fvm::Sp(ce(D, KK)*sqrt(k_)/delta(), k_)
-    );
-
-    kEqn().relax();
-    kEqn().solve();
-
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields(D, KK);
-}
-
-
-bool dynOneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        filter_.read(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
deleted file mode 100644
index 1a084a6ce..000000000
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ /dev/null
@@ -1,184 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::dynOneEqEddy
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    Localised Dynamic One Equation Eddy Viscosity Model for incompressible
-    flows
-
-    Eddy viscosity SGS model using a modeled balance equation to simulate
-    the behaviour of k, hence
-    \verbatim
-        d/dt(k) + div(U*k) - div(nuSgs*grad(k))
-        =
-        -B*L - ce*rho*k^3/2/delta
-    and
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-    where
-        nuSgs = cD*delta^2*||D||
-        nuEff = nuSgs + nu
-    \endverbatim
-
-    A dynamic procedure is here applied to evaluate ck and ce
-    \verbatim
-        ck=<L.M>/<M.M>
-    and
-        ce=<e*m>/<m*m>
-    where
-       K = 0.5*(F(U.U) - F(U).F(U))
-       L = (F(U*U) - F(U)*F(U) - 0.33*K*I)
-       M = delta*(F(sqrt(k)*D) - 2*sqrt(K + filter(k))*F(D))
-       m = pow(K + F(k), 3.0/2.0)/(2*delta) - F(pow(k, 3.0/2.0))/delta
-       e = 2*delta*ck*(F(sqrt(k)*(D && D)) - 2*sqrt(K + F(k))*(F(D) && F(D)))/
-    \endverbatim
-
-SourceFiles
-    dynOneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef dynOneEqEddy_H
-#define dynOneEqEddy_H
-
-#include "GenEddyVisc.H"
-#include "simpleFilter.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class dynOneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class dynOneEqEddy
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        simpleFilter simpleFilter_;
-        autoPtr<LESfilter> filterPtr_;
-        LESfilter& filter_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields
-        (
-            const volSymmTensorField& D,
-            const volScalarField& KK
-        );
-
-        //- Calculate ck, ce by filtering the velocity field U.
-        volScalarField ck
-        (
-            const volSymmTensorField&,
-            const volScalarField&
-        ) const;
-
-        volScalarField ce
-        (
-            const volSymmTensorField&,
-            const volScalarField&
-        ) const;
-
-        // Disallow default bitwise copy construct and assignment
-        dynOneEqEddy(const dynOneEqEddy&);
-        dynOneEqEddy& operator=(const dynOneEqEddy&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("dynOneEqEddy");
-
-    // Constructors
-
-        //- Construct from components
-        dynOneEqEddy
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~dynOneEqEddy()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
deleted file mode 100644
index 61fc5b550..000000000
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
+++ /dev/null
@@ -1,209 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "homogeneousDynOneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(homogeneousDynOneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, homogeneousDynOneEqEddy, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void homogeneousDynOneEqEddy::updateSubGridScaleFields
-(
-    const volSymmTensorField& D
-)
-{
-    nuSgs_ = ck(D)*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-dimensionedScalar homogeneousDynOneEqEddy::ck
-(
-    const volSymmTensorField& D
-) const
-{
-    tmp<volScalarField> KK = 0.5*(filter_(magSqr(U())) - magSqr(filter_(U())));
-
-    const volSymmTensorField MM
-    (
-        delta()*(filter_(sqrt(k_)*D) - 2*sqrt(KK + filter_(k_))*filter_(D))
-    );
-
-    dimensionedScalar MMMM = average(magSqr(MM));
-
-    if (MMMM.value() > VSMALL)
-    {
-        tmp<volSymmTensorField> LL = dev(filter_(sqr(U())) - sqr(filter_(U())));
-
-        return average(LL && MM)/MMMM;
-    }
-    else
-    {
-        return 0.0;
-    }
-}
-
-
-dimensionedScalar homogeneousDynOneEqEddy::ce
-(
-    const volSymmTensorField& D
-) const
-{
-    const volScalarField KK
-    (
-        0.5*(filter_(magSqr(U())) - magSqr(filter_(U())))
-    );
-
-    const volScalarField mm
-    (
-        pow(KK + filter_(k_), 1.5)/(2*delta()) - filter_(pow(k_, 1.5))/delta()
-    );
-
-    dimensionedScalar mmmm = average(magSqr(mm));
-
-    if (mmmm.value() > VSMALL)
-    {
-        tmp<volScalarField> ee =
-        (
-            2*delta()*ck(D)
-          * (
-                filter_(sqrt(k_)*magSqr(D))
-              - 2*sqrt(KK + filter_(k_))*magSqr(filter_(D))
-            )
-        );
-
-        return average(ee*mm)/mmmm;
-    }
-    else
-    {
-        return 0.0;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-homogeneousDynOneEqEddy::homogeneousDynOneEqEddy
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
-    filter_(filterPtr_())
-{
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields(symm(fvc::grad(U)));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void homogeneousDynOneEqEddy::correct(const tmp<volTensorField>& tgradU)
-{
-    const volTensorField& gradU = tgradU();
-
-    GenEddyVisc::correct(gradU);
-
-    const volSymmTensorField D(symm(gradU));
-
-    const volScalarField P(2.0*nuSgs_*magSqr(D));
-
-    tmp<fvScalarMatrix> kEqn
-    (
-       fvm::ddt(k_)
-     + fvm::div(phi(), k_)
-     - fvm::laplacian(DkEff(), k_)
-    ==
-       P
-     - fvm::Sp(ce(D)*sqrt(k_)/delta(), k_)
-    );
-
-    kEqn().relax();
-    kEqn().solve();
-
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields(D);
-}
-
-
-bool homogeneousDynOneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        filter_.read(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
deleted file mode 100644
index ea196dbe1..000000000
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
+++ /dev/null
@@ -1,162 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::homogeneousDynOneEqEddy
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    One Equation Eddy Viscosity Model for incompressible flows.
-
-    Eddy viscosity SGS model using a modeled balance equation to simulate
-    the behaviour of k.
-
-    Thus
-    \verbatim
-        d/dt(k) + div(U*k) - div(nuSgs*grad(k))
-        =
-        -B*L - ce*k^3/2/delta
-
-    and
-
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        nuSgs = ck*sqrt(k)*delta
-        nuEff = nuSgs + nu
-    \endverbatim
-
-SourceFiles
-    homogeneousDynOneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef homogeneousDynOneEqEddy_H
-#define homogeneousDynOneEqEddy_H
-
-#include "GenEddyVisc.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class homogeneousDynOneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class homogeneousDynOneEqEddy
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        autoPtr<LESfilter> filterPtr_;
-        LESfilter& filter_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volSymmTensorField& D);
-
-        //- Calculate ck, ce by filtering the velocity field U.
-        dimensionedScalar ck(const volSymmTensorField& D) const;
-        dimensionedScalar ce(const volSymmTensorField& D) const;
-
-        // Disallow default bitwise copy construct and assignment
-        homogeneousDynOneEqEddy(const homogeneousDynOneEqEddy&);
-        homogeneousDynOneEqEddy& operator=(const homogeneousDynOneEqEddy&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("homogeneousDynOneEqEddy");
-
-    // Constructors
-
-        //- Construct from components
-        homogeneousDynOneEqEddy
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~homogeneousDynOneEqEddy()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
deleted file mode 100644
index 989458619..000000000
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
+++ /dev/null
@@ -1,181 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "homogeneousDynSmagorinsky.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(homogeneousDynSmagorinsky, 0);
-addToRunTimeSelectionTable(LESModel, homogeneousDynSmagorinsky, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void homogeneousDynSmagorinsky::updateSubGridScaleFields
-(
-    const volSymmTensorField& D
-)
-{
-    nuSgs_ = cD(D)*sqr(delta())*sqrt(magSqr(D));
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-dimensionedScalar homogeneousDynSmagorinsky::cD
-(
-    const volSymmTensorField& D
-) const
-{
-    const volSymmTensorField MM
-    (
-        sqr(delta())*(filter_(mag(D)*(D)) - 4*mag(filter_(D))*filter_(D))
-    );
-
-    dimensionedScalar MMMM = average(magSqr(MM));
-
-    if (MMMM.value() > VSMALL)
-    {
-        tmp<volSymmTensorField> LL =
-            dev(filter_(sqr(U())) - (sqr(filter_(U()))));
-
-        return 0.5*average(LL && MM)/MMMM;
-    }
-    else
-    {
-        return 0.0;
-    }
-}
-
-
-dimensionedScalar homogeneousDynSmagorinsky::cI
-(
-    const volSymmTensorField& D
-) const
-{
-    const volScalarField mm
-    (
-        sqr(delta())*(4*sqr(mag(filter_(D))) - filter_(sqr(mag(D))))
-    );
-
-    dimensionedScalar mmmm = average(magSqr(mm));
-
-    if (mmmm.value() > VSMALL)
-    {
-        tmp<volScalarField> KK =
-            0.5*(filter_(magSqr(U())) - magSqr(filter_(U())));
-
-        return average(KK*mm)/mmmm;
-    }
-    else
-    {
-        return 0.0;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-homogeneousDynSmagorinsky::homogeneousDynSmagorinsky
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
-    filter_(filterPtr_())
-{
-    bound(k_,  kMin_);
-
-    updateSubGridScaleFields(dev(symm(fvc::grad(U))));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void homogeneousDynSmagorinsky::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-
-    const volSymmTensorField D(dev(symm(gradU)));
-
-    k_ = cI(D)*sqr(delta())*magSqr(D);
-    bound(k_,  kMin_);
-
-    updateSubGridScaleFields(D);
-}
-
-
-bool homogeneousDynSmagorinsky::read()
-{
-    if (GenEddyVisc::read())
-    {
-        filter_.read(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H
deleted file mode 100644
index e2ef1b362..000000000
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::homogeneousDynSmagorinsky
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    The Isochoric homogeneous dynamic Smagorinsky Model for
-    incompressible flows.
-
-    Algebraic eddy viscosity SGS model founded on the assumption that
-    local equilibrium prevails.
-    Thus,
-    \verbatim
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        k = cI*delta^2*||D||^2
-        nuSgs = cD*delta^2*||D||
-        nuEff = nuSgs + nu
-
-    In the dynamic version of the choric  Smagorinsky model
-    the coefficients cI and cD are calculated during the simulation,
-
-        cI=<K*m>/<m*m>
-
-    and
-
-        cD=1/2*<L.M>/<M.M>,
-
-    where
-
-        K = 0.5*(F(U.U) - F(U).F(U))
-        m = delta^2*(4*||F(D)||^2 - F(||D||^2))
-        L = dev(F(U*U) - F(U)*F(U))
-        M = delta^2*(F(||D||*dev(D)) - 4*||F(D)||*F(dev(D)))
-
-    The averaging <...> is over the whole domain, i.e. homogeneous turbulence
-    is assumed
-    \endverbatim
-
-SourceFiles
-    homogeneousDynSmagorinsky.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef homogeneousDynSmagorinsky_H
-#define homogeneousDynSmagorinsky_H
-
-#include "Smagorinsky.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class homogeneousDynSmagorinsky Declaration
-\*---------------------------------------------------------------------------*/
-
-class homogeneousDynSmagorinsky
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        autoPtr<LESfilter> filterPtr_;
-        LESfilter& filter_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volSymmTensorField& D);
-
-        //- Calculate coefficients cD, cI from filtering velocity field
-        dimensionedScalar cD(const volSymmTensorField& D) const;
-        dimensionedScalar cI(const volSymmTensorField& D) const;
-
-        // Disallow default bitwise copy construct and assignment
-        homogeneousDynSmagorinsky(const homogeneousDynSmagorinsky&);
-        homogeneousDynSmagorinsky& operator=(const homogeneousDynSmagorinsky&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("homogeneousDynSmagorinsky");
-
-    // Constructors
-
-        //- Construct from components
-        homogeneousDynSmagorinsky
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~homogeneousDynSmagorinsky()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C b/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C
deleted file mode 100644
index daa17b640..000000000
--- a/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.C
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "incompressibleLESdelta.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineRunTimeSelectionTable(LESdelta, dictionary);
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LESdelta::LESdelta(const word& name, const fvMesh& mesh)
-:
-    foamLESdelta(name, mesh)
-{}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<foamLESdelta> LESdelta::New
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& dict
-)
-{
-    return foamLESdelta::New(name, mesh, dict, *dictionaryConstructorTablePtr_);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H b/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H
deleted file mode 100644
index ca1d5240f..000000000
--- a/src/turbulenceModels/incompressible/LES/incompressibleLESdelta/incompressibleLESdelta.H
+++ /dev/null
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-Class
-    Foam::incompressible::LESdelta
-
-Description
-    Abstract base class for incompressible LES deltas
-
-SourceFiles
-    incompressibleLESdelta.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef incompressibleLESdelta_H
-#define incompressibleLESdelta_H
-
-#include "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// To avoid macro problems typedef scoped class
-typedef Foam::LESdelta foamLESdelta;
-
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-                          Class LESdelta Declaration
-\*---------------------------------------------------------------------------*/
-
-class LESdelta
-:
-    public foamLESdelta
-{
-
-public:
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            foamLESdelta,
-            dictionary,
-            (
-                const word& name,
-                const fvMesh& mesh,
-                const dictionary& LESdeltaDict
-            ),
-            (name, mesh, LESdeltaDict)
-        );
-
-    // Constructors
-
-        //- Construct from name and mesh
-        LESdelta(const word& name, const fvMesh& mesh);
-
-
-    // Selectors
-
-        //- Return a reference to the selected LES delta
-        static autoPtr<foamLESdelta> New
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dictionary& dict
-        );
-
-
-    //- Destructor
-    virtual ~LESdelta()
-    {}
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
deleted file mode 100644
index ad7daf84a..000000000
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ /dev/null
@@ -1,492 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kOmegaSSTSAS.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(kOmegaSSTSAS, 0);
-addToRunTimeSelectionTable(LESModel, kOmegaSSTSAS, dictionary);
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void kOmegaSSTSAS::updateSubGridScaleFields(const volScalarField& S2)
-{
-    nuSgs_ == a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-tmp<volScalarField> kOmegaSSTSAS::F1(const volScalarField& CDkOmega) const
-{
-    tmp<volScalarField> CDkOmegaPlus = max
-    (
-        CDkOmega,
-        dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10)
-    );
-
-    tmp<volScalarField> arg1 = min
-    (
-        min
-        (
-            max
-            (
-                (scalar(1)/betaStar_)*sqrt(k_)/(omega_*y_),
-                scalar(500)*nu()/(sqr(y_)*omega_)
-            ),
-            (4*alphaOmega2_)*k_/(CDkOmegaPlus*sqr(y_))
-        ),
-        scalar(10)
-    );
-
-    return tanh(pow4(arg1));
-}
-
-
-tmp<volScalarField> kOmegaSSTSAS::F2() const
-{
-    tmp<volScalarField> arg2 = min
-    (
-        max
-        (
-            (scalar(2)/betaStar_)*sqrt(k_)/(omega_*y_),
-            scalar(500)*nu()/(sqr(y_)*omega_)
-        ),
-        scalar(100)
-    );
-
-    return tanh(sqr(arg2));
-}
-
-
-tmp<volScalarField> kOmegaSSTSAS::Lvk2
-(
-    const volScalarField& S2
-) const
-{
-    return max
-    (
-        kappa_*sqrt(S2)
-       /(
-            mag(fvc::laplacian(U()))
-          + dimensionedScalar
-            (
-                "ROOTVSMALL",
-                dimensionSet(0, -1 , -1, 0, 0, 0, 0),
-                ROOTVSMALL
-            )
-        ),
-        Cs_*delta()
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kOmegaSSTSAS::kOmegaSSTSAS
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-
-    alphaK1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK1",
-            coeffDict_,
-            0.85034
-        )
-    ),
-    alphaK2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK2",
-            coeffDict_,
-            1.0
-        )
-    ),
-    alphaOmega1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega1",
-            coeffDict_,
-            0.5
-        )
-    ),
-    alphaOmega2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega2",
-            coeffDict_,
-            0.85616
-        )
-    ),
-    gamma1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma1",
-            coeffDict_,
-            0.5532
-        )
-    ),
-    gamma2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma2",
-            coeffDict_,
-            0.4403
-        )
-    ),
-    beta1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta1",
-            coeffDict_,
-            0.075
-        )
-    ),
-    beta2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta2",
-            coeffDict_,
-            0.0828
-        )
-    ),
-    betaStar_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "betaStar",
-            coeffDict_,
-            0.09
-        )
-    ),
-    a1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "a1",
-            coeffDict_,
-            0.31
-        )
-    ),
-    c1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "c1",
-            coeffDict_,
-            10.0
-        )
-    ),
-    Cs_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cs",
-            coeffDict_,
-            0.262
-        )
-    ),
-    alphaPhi_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaPhi",
-            coeffDict_,
-            0.666667
-        )
-    ),
-    zetaTilda2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "zetaTilda2",
-            coeffDict_,
-            1.755
-        )
-    ),
-    FSAS_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "FSAS",
-            coeffDict_,
-            1.25
-        )
-    ),
-
-    omegaMin_("omegaMin", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-         )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            *this,
-            0.41
-        )
-    ),
-
-    y_(wallDist::New(mesh_).y()),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    omega_
-    (
-        IOobject
-        (
-            "omega",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    nuSgs_
-    (
-        IOobject
-        (
-            "nuSgs",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    )
-{
-    omegaMin_.readIfPresent(*this);
-
-    bound(k_, kMin_);
-    bound(omega_, omegaMin_);
-
-    updateSubGridScaleFields(2.0*magSqr(symm(fvc::grad(U))));
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU)
-{
-    LESModel::correct(gradU);
-
-    volScalarField S2(2.0*magSqr(symm(gradU())));
-    gradU.clear();
-
-    volVectorField gradK(fvc::grad(k_));
-    volVectorField gradOmega(fvc::grad(omega_));
-    volScalarField L(sqrt(k_)/(pow025(Cmu_)*omega_));
-    volScalarField CDkOmega((2.0*alphaOmega2_)*(gradK & gradOmega)/omega_);
-    volScalarField F1(this->F1(CDkOmega));
-    volScalarField G(GName(), nuSgs_*S2);
-
-    // Turbulent kinetic energy equation
-    {
-        fvScalarMatrix kEqn
-        (
-            fvm::ddt(k_)
-          + fvm::div(phi(), k_)
-          - fvm::laplacian(DkEff(F1), k_)
-        ==
-            min(G, c1_*betaStar_*k_*omega_)
-          - fvm::Sp(betaStar_*omega_, k_)
-        );
-
-        kEqn.relax();
-        kEqn.solve();
-    }
-    bound(k_, kMin_);
-
-    tmp<volScalarField> grad_omega_k = max
-    (
-        magSqr(gradOmega)/sqr(omega_),
-        magSqr(gradK)/sqr(k_)
-    );
-
-    // Turbulent frequency equation
-    {
-        fvScalarMatrix omegaEqn
-        (
-            fvm::ddt(omega_)
-          + fvm::div(phi(), omega_)
-          - fvm::laplacian(DomegaEff(F1), omega_)
-        ==
-            gamma(F1)*S2
-          - fvm::Sp(beta(F1)*omega_, omega_)
-          - fvm::SuSp       // cross diffusion term
-            (
-                (F1 - scalar(1))*CDkOmega/omega_,
-                omega_
-            )
-          + FSAS_
-           *max
-            (
-                dimensionedScalar("zero",dimensionSet(0, 0, -2, 0, 0), 0.0),
-                zetaTilda2_*kappa_*S2*sqr(L/Lvk2(S2))
-              - 2.0/alphaPhi_*k_*grad_omega_k
-            )
-        );
-
-        omegaEqn.relax();
-        omegaEqn.solve();
-    }
-    bound(omega_, omegaMin_);
-
-    updateSubGridScaleFields(S2);
-}
-
-
-tmp<volScalarField> kOmegaSSTSAS::epsilon() const
-{
-    return 2.0*nuEff()*magSqr(symm(fvc::grad(U())));
-}
-
-
-tmp<volSymmTensorField> kOmegaSSTSAS::B() const
-{
-    return ((2.0/3.0)*I)*k() - nuSgs()*twoSymm(fvc::grad(U()));
-}
-
-
-tmp<volSymmTensorField> kOmegaSSTSAS::devReff() const
-{
-    return -nuEff()*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<fvVectorMatrix> kOmegaSSTSAS::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> kOmegaSSTSAS::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool kOmegaSSTSAS::read()
-{
-    if (LESModel::read())
-    {
-        alphaK1_.readIfPresent(coeffDict());
-        alphaK2_.readIfPresent(coeffDict());
-        alphaOmega1_.readIfPresent(coeffDict());
-        alphaOmega2_.readIfPresent(coeffDict());
-        gamma1_.readIfPresent(coeffDict());
-        gamma2_.readIfPresent(coeffDict());
-        beta1_.readIfPresent(coeffDict());
-        beta2_.readIfPresent(coeffDict());
-        betaStar_.readIfPresent(coeffDict());
-        a1_.readIfPresent(coeffDict());
-        c1_.readIfPresent(coeffDict());
-        Cs_.readIfPresent(coeffDict());
-        alphaPhi_.readIfPresent(coeffDict());
-        zetaTilda2_.readIfPresent(coeffDict());
-        FSAS_.readIfPresent(coeffDict());
-
-        omegaMin_.readIfPresent(*this);
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
deleted file mode 100644
index b10a0e9ed..000000000
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ /dev/null
@@ -1,292 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::kOmegaSSTSAS
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    kOmegaSSTSAS LES turbulence model for incompressible flows
-    based on:
-
-    "Evaluation of the SST-SAS model: channel flow, asymmetric diffuser
-    and axi-symmetric hill".
-    European Conference on Computational Fluid Dynamics ECCOMAS CFD 2006.
-    Lars Davidson
-
-
-    The first term of the Qsas expression is corrected following:
-
-    DESider A European Effort on Hybrid RANS-LES Modelling:
-    Results of the European-Union Funded Project, 2004 - 2007
-    (Notes on Numerical Fluid Mechanics and Multidisciplinary Design).
-    Chapter 2, section 8 Formulation of the Scale-Adaptive Simulation (SAS)
-    Model during the DESIDER Project. Published in Springer-Verlag Berlin
-    Heidelberg 2009.
-    F. R. Menter and Y. Egorov.
-
-
-SourceFiles
-    kOmegaSSTSAS.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kOmegaSSTSAS_H
-#define kOmegaSSTSAS_H
-
-#include "LESModel.H"
-#include "volFields.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class kOmegaSSTSAS Declaration
-\*---------------------------------------------------------------------------*/
-
-class kOmegaSSTSAS
-:
-    public LESModel
-{
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volScalarField& D);
-
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTSAS(const kOmegaSSTSAS&);
-        kOmegaSSTSAS& operator=(const kOmegaSSTSAS&);
-
-
-protected:
-
-    // Protected data
-
-        // Model constants
-
-            dimensionedScalar alphaK1_;
-            dimensionedScalar alphaK2_;
-
-            dimensionedScalar alphaOmega1_;
-            dimensionedScalar alphaOmega2_;
-
-            dimensionedScalar gamma1_;
-            dimensionedScalar gamma2_;
-
-            dimensionedScalar beta1_;
-            dimensionedScalar beta2_;
-
-            dimensionedScalar betaStar_;
-
-            dimensionedScalar a1_;
-            dimensionedScalar c1_;
-            dimensionedScalar Cs_;
-
-            dimensionedScalar alphaPhi_;
-            dimensionedScalar zetaTilda2_;
-            dimensionedScalar FSAS_;
-
-            dimensionedScalar omegaMin_;
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar kappa_;
-
-
-        // Fields
-
-            //- Wall distance
-            //  Note: different to wall distance in parent RASModel
-            //  which is for near-wall cells only
-            const volScalarField& y_;
-
-            volScalarField k_;
-            volScalarField omega_;
-            volScalarField nuSgs_;
-
-
-    // Protected Member Functions
-
-        tmp<volScalarField> Lvk2
-        (
-            const volScalarField& S2
-        ) const;
-
-        tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
-        tmp<volScalarField> F2() const;
-
-        tmp<volScalarField> blend
-        (
-            const volScalarField& F1,
-            const dimensionedScalar& psi1,
-            const dimensionedScalar& psi2
-        ) const
-        {
-            return F1*(psi1 - psi2) + psi2;
-        }
-
-        tmp<volScalarField> alphaK
-        (
-            const volScalarField& F1
-        ) const
-        {
-            return blend(F1, alphaK1_, alphaK2_);
-        }
-
-        tmp<volScalarField> alphaOmega
-        (
-             const volScalarField& F1
-        ) const
-        {
-            return blend(F1, alphaOmega1_, alphaOmega2_);
-        }
-
-        tmp<volScalarField> beta
-        (
-            const volScalarField& F1
-        ) const
-        {
-            return blend(F1, beta1_, beta2_);
-        }
-
-        tmp<volScalarField> gamma
-        (
-            const volScalarField& F1
-        ) const
-        {
-            return blend(F1, gamma1_, gamma2_);
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kOmegaSSTSAS");
-
-
-    // Constructors
-
-        //- Construct from components
-        kOmegaSSTSAS
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~kOmegaSSTSAS()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return omega
-        virtual tmp<volScalarField> omega() const
-        {
-            return omega_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                 new volScalarField("DkEff", alphaK(F1)*nuSgs_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for omega
-        tmp<volScalarField> DomegaEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DomegaEff", alphaOmega(F1)*nuSgs_ + nu())
-            );
-        }
-
-        //- Return sub-grid disipation rate
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return SGS viscosity
-        virtual tmp<volScalarField> nuSgs() const
-        {
-            return nuSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations (k-w) and correct the turbulence
-        //  viscosity
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
deleted file mode 100644
index b0176e804..000000000
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C
+++ /dev/null
@@ -1,183 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "laminar.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(LESModel, laminar, dictionary);
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-laminar::laminar
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> laminar::k() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("k", sqr(U().dimensions()), 0.0)
-        )
-    );
-}
-
-tmp<volScalarField> laminar::epsilon() const
-{
-    return 2*nu()*magSqr(symm(fvc::grad(U())));
-}
-
-tmp<volScalarField> laminar::nuSgs() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "nuSgs",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("nuSgs", nu()().dimensions(), 0.0)
-        )
-    );
-}
-
-tmp<volScalarField> laminar::nuEff() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField("nuEff", nu())
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::B() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "B",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedSymmTensor
-            (
-                "B", sqr(U().dimensions()), symmTensor::zero
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::devReff() const
-{
-    return -nu()*dev(twoSymm(fvc::grad(U())));
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nu(), U)
-      - fvc::div(nu()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool laminar::read()
-{
-    return LESModel::read();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
deleted file mode 100644
index 7a7f501d4..000000000
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H
+++ /dev/null
@@ -1,138 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::laminar
-
-Description
-    LES model for laminar incompressible flow.
-    It simply returns laminar properties.
-
-SourceFiles
-    laminar.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef lesLaminar_H
-#define lesLaminar_H
-
-#include "LESModel.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class laminar Declaration
-\*---------------------------------------------------------------------------*/
-
-class laminar
-:
-    public LESModel
-{
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        laminar(const laminar&);
-        laminar& operator=(const laminar&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("laminar");
-
-
-    // Constructors
-
-        //- Construct from components
-        laminar
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~laminar()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const;
-
-        //- Return sub-grid disipation rate
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return SGS viscosity
-        virtual tmp<volScalarField> nuSgs() const;
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> nuEff() const;
-
-        //- Return the sub-grid stress tensor B.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Read LESProperties dictionary
-        bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
deleted file mode 100644
index 7e82fe9fd..000000000
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
+++ /dev/null
@@ -1,160 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "mixedSmagorinsky.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(mixedSmagorinsky, 0);
-addToRunTimeSelectionTable(LESModel, mixedSmagorinsky, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-mixedSmagorinsky::mixedSmagorinsky
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    scaleSimilarity(U, phi, transport),
-    Smagorinsky(U, phi, transport)
-{
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> mixedSmagorinsky::k() const
-{
-    return
-    (
-        scaleSimilarity::k()
-      + Smagorinsky::k()
-    );
-}
-
-
-tmp<volScalarField> mixedSmagorinsky::epsilon() const
-{
-    return
-    (
-        scaleSimilarity::epsilon()
-      + Smagorinsky::epsilon()
-    );
-}
-
-
-tmp<volSymmTensorField> mixedSmagorinsky::B() const
-{
-    return
-    (
-        scaleSimilarity::B()
-      + Smagorinsky::B()
-    );
-}
-
-
-tmp<volSymmTensorField> mixedSmagorinsky::devReff() const
-{
-    return
-    (
-        scaleSimilarity::devReff()
-      + Smagorinsky::devReff()
-    );
-}
-
-
-tmp<fvVectorMatrix> mixedSmagorinsky::divDevReff
-(
-    volVectorField& U
-) const
-{
-    return
-    (
-        scaleSimilarity::divDevReff(U)
-      + Smagorinsky::divDevReff(U)
-    );
-}
-
-
-tmp<fvVectorMatrix> mixedSmagorinsky::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    return
-    (
-        scaleSimilarity::divDevRhoReff(rho, U)
-      + Smagorinsky::divDevRhoReff(rho, U)
-    );
-}
-
-
-void mixedSmagorinsky::correct(const tmp<volTensorField>& gradU)
-{
-    scaleSimilarity::correct(gradU);
-    Smagorinsky::correct(gradU);
-}
-
-
-bool mixedSmagorinsky::read()
-{
-    if (LESModel::read())
-    {
-        scaleSimilarity::read();
-        Smagorinsky::read();
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
deleted file mode 100644
index 8a30f9dea..000000000
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
+++ /dev/null
@@ -1,167 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::mixedSmagorinsky
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    The mixed Isochoric Smagorinsky Model for incompressible flows.
-
-    The mixed model is a linear combination of an eddy viscosity model
-    (Smagorinsky) with a scale similarity model.  Hence
-    \verbatim
-        B = (L + C) + R = (F(v*v) - F(v)*F(v)) + R
-    \endverbatim
-
-    The algebraic eddy viscosity SGS model is founded on the assumption
-    that local equilibrium prevails, hence
-    \verbatim
-        R = 2/3*k*I - 2*nuEff*dev(D)
-    where
-        k = cI*delta^2*||D||^2
-        nuEff = ck*sqrt(k)*delta + nu
-    \endverbatim
-
-    The Leonard and cross contributions are incorporated
-    by adding,
-    \verbatim
-         + div(((filter(U*U) - filter(U)*filter(U)) -
-           0.333*I*tr(filter(U*U) - filter(U)*filter(U))))
-         + div((filter(U*epsilon) - filter(U)*filter(epsilon)))
-    \endverbatim
-    to the rhs. of the equations.
-
-SourceFiles
-    mixedSmagorinsky.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef mixedSmagorinsky_H
-#define mixedSmagorinsky_H
-
-#include "scaleSimilarity.H"
-#include "Smagorinsky.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class mixedSmagorinsky Declaration
-\*---------------------------------------------------------------------------*/
-
-class mixedSmagorinsky
-:
-    public scaleSimilarity,
-    public Smagorinsky
-{
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        mixedSmagorinsky(const mixedSmagorinsky&);
-        mixedSmagorinsky& operator=(const mixedSmagorinsky&);
-
-public:
-
-    //- Runtime type information
-    TypeName("mixedSmagorinsky");
-
-
-    // Constructors
-
-        //- Construct from components
-        mixedSmagorinsky
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~mixedSmagorinsky()
-    {}
-
-
-    // Member Functions
-
-        //- Return the SGS turbulent kinetic energy.
-        virtual tmp<volScalarField> k() const;
-
-        //- Return the SGS turbulent disipation rate.
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the SGS viscosity.
-        virtual tmp<volScalarField> nuSgs() const
-        {
-            return nuSgs_;
-        }
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
deleted file mode 100644
index 2e95004a2..000000000
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
+++ /dev/null
@@ -1,146 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "oneEqEddy.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(oneEqEddy, 0);
-addToRunTimeSelectionTable(LESModel, oneEqEddy, dictionary);
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void oneEqEddy::updateSubGridScaleFields()
-{
-    nuSgs_ = ck_*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-oneEqEddy::oneEqEddy
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    ck_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "ck",
-            coeffDict_,
-            0.094
-        )
-    )
-{
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void oneEqEddy::correct(const tmp<volTensorField>& gradU)
-{
-    GenEddyVisc::correct(gradU);
-
-    volScalarField G(GName(), 2.0*nuSgs_*magSqr(symm(gradU)));
-
-    tmp<fvScalarMatrix> kEqn
-    (
-       fvm::ddt(k_)
-     + fvm::div(phi(), k_)
-     - fvm::laplacian(DkEff(), k_)
-    ==
-       G
-     - fvm::Sp(ce_*sqrt(k_)/delta(), k_)
-    );
-
-    kEqn().relax();
-    kEqn().solve();
-
-    bound(k_, kMin_);
-
-    updateSubGridScaleFields();
-}
-
-
-bool oneEqEddy::read()
-{
-    if (GenEddyVisc::read())
-    {
-        ck_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
deleted file mode 100644
index fef3986d4..000000000
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
+++ /dev/null
@@ -1,154 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::oneEqEddy
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    One Equation Eddy Viscosity Model for incompressible flows
-
-    Eddy viscosity SGS model using a modeled balance equation to simulate the
-    behaviour of k, hence,
-    \verbatim
-        d/dt(k) + div(U*k) - div(nuEff*grad(k))
-        =
-        -D:B - ce*k^(3/2)/delta
-
-    and
-
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        D = symm(grad(U));
-        nuSgs = ck*sqrt(k)*delta
-        nuEff = nuSgs + nu
-    \endverbatim
-
-SourceFiles
-    oneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef oneEqEddy_H
-#define oneEqEddy_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class oneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class oneEqEddy
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        volScalarField k_;
-
-        dimensionedScalar ck_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields();
-
-        // Disallow default bitwise copy construct and assignment
-        oneEqEddy(const oneEqEddy&);
-        oneEqEddy& operator=(const oneEqEddy&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("oneEqEddy");
-
-    // Constructors
-
-        //- Construct from components
-        oneEqEddy
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~oneEqEddy()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nuSgs_ + nu())
-            );
-        }
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
deleted file mode 100644
index 12c6b4f31..000000000
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
+++ /dev/null
@@ -1,129 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "scaleSimilarity.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(scaleSimilarity, 0);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-scaleSimilarity::scaleSimilarity
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
-    filter_(filterPtr_())
-{
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> scaleSimilarity::k() const
-{
-    return(0.5*(filter_(magSqr(U())) - magSqr(filter_(U()))));
-}
-
-
-tmp<volScalarField> scaleSimilarity::epsilon() const
-{
-    tmp<volSymmTensorField> D = symm(fvc::grad(U()));
-
-    return((filter_(sqr(U())) - sqr(filter_(U()))) && D);
-}
-
-
-tmp<volSymmTensorField> scaleSimilarity::B() const
-{
-    return(filter_(sqr(U())) - sqr(filter_(U())));
-}
-
-
-tmp<volSymmTensorField> scaleSimilarity::devReff() const
-{
-    return dev(B());
-}
-
-
-tmp<fvVectorMatrix> scaleSimilarity::divDevReff(volVectorField& U) const
-{
-    return fvm::Su(fvc::div(devReff()), U);
-}
-
-
-tmp<fvVectorMatrix> scaleSimilarity::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    return fvm::Su(fvc::div(rho*devReff()), U);
-}
-
-
-void scaleSimilarity::correct(const tmp<volTensorField>&)
-{}
-
-
-bool scaleSimilarity::read()
-{
-    if (LESModel::read())
-    {
-        filter_.read(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
deleted file mode 100644
index 94e9367fe..000000000
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
+++ /dev/null
@@ -1,146 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::scaleSimilarity
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    General base class for all scale similarity models
-    for incompressible flows.
-
-    Since such models do not work without additional eddy viscosity terms,
-    this class must be combined with an eddy viscosity model of some form.
-
-SourceFiles
-    scaleSimilarity.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef scaleSimilarity_H
-#define scaleSimilarity_H
-
-#include "LESModel.H"
-#include "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class scaleSimilarity Declaration
-\*---------------------------------------------------------------------------*/
-
-class scaleSimilarity
-:
-    virtual public LESModel
-{
-    // Private data
-
-        autoPtr<LESfilter> filterPtr_;
-        LESfilter& filter_;
-
-
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        scaleSimilarity(const scaleSimilarity&);
-        scaleSimilarity& operator=(const scaleSimilarity&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("scaleSimilarity");
-
-    // Constructors
-
-        //- Construct from components
-        scaleSimilarity
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~scaleSimilarity()
-    {}
-
-
-    // Member Functions
-
-        //- Return the SGS turbulent kinetic energy.
-        virtual tmp<volScalarField> k() const;
-
-        //- Return the SGS turbulent dissipation.
-        virtual tmp<volScalarField> epsilon() const;
-
-        //- Return the sub-grid stress tensor.
-        virtual tmp<volSymmTensorField> B() const;
-
-        //- Return the effective sub-grid turbulence stress tensor
-        //  including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the deviatoric part of the effective sub-grid
-        //  turbulence stress tensor including the laminar stress
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>&);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
deleted file mode 100644
index 80ffc16c5..000000000
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
+++ /dev/null
@@ -1,174 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "spectEddyVisc.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(spectEddyVisc, 0);
-addToRunTimeSelectionTable(LESModel, spectEddyVisc, dictionary);
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void spectEddyVisc::updateSubGridScaleFields(const volTensorField& gradU)
-{
-    const volScalarField Re(sqr(delta())*mag(symm(gradU))/nu());
-    for (label i=0; i<5; i++)
-    {
-        nuSgs_ =
-            nu()
-           /(
-                 scalar(1)
-               - exp(-cB_*pow(nu()/(nuSgs_ + nu()), 1.0/3.0)*pow(Re, -2.0/3.0))
-            );
-    }
-
-    nuSgs_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-spectEddyVisc::spectEddyVisc
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    LESModel(modelName, U, phi, transport, turbulenceModelName),
-    GenEddyVisc(U, phi, transport),
-
-    cB_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cB",
-            coeffDict_,
-            8.22
-        )
-    ),
-    cK1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cK1",
-            coeffDict_,
-            0.83
-        )
-    ),
-    cK2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cK2",
-            coeffDict_,
-            1.03
-        )
-    ),
-    cK3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cK3",
-            coeffDict_,
-            4.75
-        )
-    ),
-    cK4_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "cK4",
-            coeffDict_,
-            2.55
-        )
-    )
-{
-    printCoeffs();
-
-    updateSubGridScaleFields(fvc::grad(U));
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> spectEddyVisc::k() const
-{
-    const volScalarField eps(2*nuEff()*magSqr(symm(fvc::grad(U()))));
-
-    return
-        cK1_*pow(delta()*eps, 2.0/3.0)
-       *exp(-cK2_*pow(delta(), -4.0/3.0)*nu()/pow(eps, 1.0/3.0))
-      - cK3_*sqrt(eps*nu())
-       *erfc(cK4_*pow(delta(), -2.0/3.0)*sqrt(nu())*pow(eps, -1.0/6.0));
-}
-
-
-void spectEddyVisc::correct(const tmp<volTensorField>& gradU)
-{
-    GenEddyVisc::correct(gradU);
-    updateSubGridScaleFields(gradU());
-}
-
-
-bool spectEddyVisc::read()
-{
-    if (GenEddyVisc::read())
-    {
-        cB_.readIfPresent(coeffDict());
-        cK1_.readIfPresent(coeffDict());
-        cK2_.readIfPresent(coeffDict());
-        cK3_.readIfPresent(coeffDict());
-        cK4_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
deleted file mode 100644
index 7428f5667..000000000
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
+++ /dev/null
@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::LESModels::spectEddyVisc
-
-Group
-    grpIcoLESTurbulence
-
-Description
-    The Isochoric spectral Eddy Viscosity Model for incompressible flows.
-
-    Algebraic eddy viscosity SGS model founded on the assumption that
-    local equilibrium prevail and that viscous effects may be of importance.
-
-    Thus,
-    \verbatim
-        B = 2/3*k*I - 2*nuSgs*dev(D)
-        Beff = 2/3*k*I - 2*nuEff*dev(D)
-
-    where
-
-        k = cK1*delta^(2/3)*eps^(2/3)*exp(-cK2*delta^(4/3)*nu*eps^(-1/3)) -
-            ck3*sqrt(eps*nu)*erfc(ck4*delta^(-2/3)*sqrt(nu)*eps^(-1/6)))
-
-        nuEff = nu/(1 - exp(-cB*pow((nu/nuEff), 1.0/3.0)*pow(Re, -2.0/3.0)))
-        nuSgs = nuEff - nu
-
-        Re = delta^2*mag(D)/nu
-    \endverbatim
-
-SourceFiles
-    spectEddyVisc.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef spectEddyVisc_H
-#define spectEddyVisc_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class spectEddyVisc Declaration
-\*---------------------------------------------------------------------------*/
-
-class spectEddyVisc
-:
-    public GenEddyVisc
-{
-    // Private data
-
-        dimensionedScalar cB_;
-        dimensionedScalar cK1_;
-        dimensionedScalar cK2_;
-        dimensionedScalar cK3_;
-        dimensionedScalar cK4_;
-
-
-    // Private Member Functions
-
-        //- Update sub-grid scale fields
-        void updateSubGridScaleFields(const volTensorField& gradU);
-
-        // Disallow default bitwise copy construct and assignment
-        spectEddyVisc(const spectEddyVisc&);
-        spectEddyVisc& operator=(const spectEddyVisc&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("spectEddyVisc");
-
-    // Constructors
-
-        // Construct from components
-        spectEddyVisc
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~spectEddyVisc()
-    {}
-
-
-    // Member Functions
-
-        //- Return SGS kinetic energy
-        virtual tmp<volScalarField> k() const;
-
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>&);
-
-        //- Read LESProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
deleted file mode 100644
index 18d5f5522..000000000
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ /dev/null
@@ -1,475 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LRR.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LRR, 0);
-addToRunTimeSelectionTable(RASModel, LRR, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LRR::LRR
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    Clrr1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clrr1",
-            coeffDict_,
-            1.8
-        )
-    ),
-    Clrr2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clrr2",
-            coeffDict_,
-            0.6
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    Cs_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cs",
-            coeffDict_,
-            0.25
-        )
-    ),
-    Ceps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceps",
-            coeffDict_,
-            0.15
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    couplingFactor_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "couplingFactor",
-            coeffDict_,
-            0.0
-        )
-    ),
-
-    R_
-    (
-        IOobject
-        (
-            "R",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateR("R", mesh_)
-    ),
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
-    )
-{
-    if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-    {
-        FatalErrorIn
-        (
-            "LRR::LRR"
-            "(const volVectorField& U, const surfaceScalarField& phi,"
-            "transportModel& transport)"
-        )   << "couplingFactor = " << couplingFactor_
-            << " is not in range 0 - 1" << nl
-            << exit(FatalError);
-    }
-
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> LRR::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            R_ - nu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LRR::divDevReff(volVectorField& U) const
-{
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div(R_ + couplingFactor_*nut_*fvc::grad(U), "div(R)")
-          + fvc::laplacian
-            (
-                 (1.0 - couplingFactor_)*nut_,
-                 U,
-                 "laplacian(nuEff,U)"
-            )
-          - fvm::laplacian(nuEff(), U)
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(R_)
-          + fvc::laplacian(nut_, U, "laplacian(nuEff,U)")
-          - fvm::laplacian(nuEff(), U)
-        );
-    }
-}
-
-
-tmp<fvVectorMatrix> LRR::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div
-            (
-                rho*R_ + couplingFactor_*(rho*nut_)*fvc::grad(U),
-                "div((rho*R))"
-            )
-          + fvc::laplacian
-            (
-                (1.0 - couplingFactor_)*rho*nut_,
-                U,
-                "laplacian(muEff,U)"
-            )
-          - fvm::laplacian(muEff, U)
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(rho*R_)
-          + fvc::laplacian(rho*nut_, U, "laplacian(muEff,U)")
-          - fvm::laplacian(muEff, U)
-        );
-    }
-}
-
-
-bool LRR::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        Clrr1_.readIfPresent(coeffDict());
-        Clrr2_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        Cs_.readIfPresent(coeffDict());
-        Ceps_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-
-        couplingFactor_.readIfPresent(coeffDict());
-
-        if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-        {
-            FatalErrorIn("LRR::read()")
-                << "couplingFactor = " << couplingFactor_
-                << " is not in range 0 - 1"
-                << exit(FatalError);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void LRR::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        return;
-    }
-
-    volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G(GName(), 0.5*mag(tr(P)));
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(epsilon_)
-      + fvm::div(phi_, epsilon_)
-    //- fvm::laplacian(Ceps*(K/epsilon_)*R, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-      ==
-        C1_*G*epsilon_/k_
-      - fvm::Sp(C2_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Reynolds stress equation
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-                P[faceCelli] *= min
-                (
-                    G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL),
-                    1.0
-                );
-            }
-        }
-    }
-
-
-    tmp<fvSymmTensorMatrix> REqn
-    (
-        fvm::ddt(R_)
-      + fvm::div(phi_, R_)
-    //- fvm::laplacian(Cs*(k_/epsilon_)*R_, R_)
-      - fvm::laplacian(DREff(), R_)
-      + fvm::Sp(Clrr1_*epsilon_/k_, R_)
-      ==
-        P
-      - (2.0/3.0*(1 - Clrr1_)*I)*epsilon_
-      - Clrr2_*dev(P)
-    );
-
-    REqn().relax();
-    solve(REqn);
-
-    R_.max
-    (
-        dimensionedSymmTensor
-        (
-            "zero",
-            R_.dimensions(),
-            symmTensor
-            (
-                kMin_.value(), -GREAT, -GREAT,
-                kMin_.value(), -GREAT,
-                kMin_.value()
-            )
-        )
-    );
-
-    k_ = 0.5*tr(R_);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-
-    // Correct wall shear stresses
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            symmTensorField& Rw = R_.boundaryField()[patchi];
-
-            const scalarField& nutw = nut_.boundaryField()[patchi];
-
-            const vectorField snGradU(U_.boundaryField()[patchi].snGrad());
-
-            const vectorField& faceAreas
-                = mesh_.Sf().boundaryField()[patchi];
-
-            const scalarField& magFaceAreas
-                = mesh_.magSf().boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                // Calculate near-wall velocity gradient
-                tensor gradUw
-                    = (faceAreas[facei]/magFaceAreas[facei])*snGradU[facei];
-
-                // Calculate near-wall shear-stress tensor
-                tensor tauw = -nutw[facei]*2*symm(gradUw);
-
-                // Reset the shear components of the stress tensor
-                Rw[facei].xy() = tauw.xy();
-                Rw[facei].xz() = tauw.xz();
-                Rw[facei].yz() = tauw.yz();
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
deleted file mode 100644
index 24cf36c58..000000000
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
+++ /dev/null
@@ -1,204 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::RASModels::LRR
-
-Group
-    grpIcoRASTurbulence
-
-Description
-    Launder, Reece and Rodi Reynolds-stress turbulence model for
-    incompressible flows.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        LRRCoeffs
-        {
-            Cmu         0.09;
-            Clrr1       1.8;
-            Clrr2       0.6;
-            C1          1.44;
-            C2          1.92;
-            Cs          0.25;
-            Ceps        0.15;
-            sigmaEps    1.3;
-            couplingFactor  0.0;    // only for incompressible
-        }
-    \endverbatim
-
-SourceFiles
-    LRR.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LRR_H
-#define LRR_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LRR Declaration
-\*---------------------------------------------------------------------------*/
-
-class LRR
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-
-            dimensionedScalar Clrr1_;
-            dimensionedScalar Clrr2_;
-
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar Cs_;
-            dimensionedScalar Ceps_;
-            dimensionedScalar sigmaEps_;
-
-            dimensionedScalar couplingFactor_;
-
-
-        // Fields
-
-            volSymmTensorField R_;
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField nut_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LRR");
-
-    // Constructors
-
-        //- Construct from components
-        LRR
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~LRR()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
-
-        //- Return the effective diffusivity for R
-        tmp<volScalarField> DREff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DREff", nut_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const
-        {
-            return R_;
-        }
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
deleted file mode 100644
index b8d55d9b3..000000000
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ /dev/null
@@ -1,527 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LaunderGibsonRSTM.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LaunderGibsonRSTM, 0);
-addToRunTimeSelectionTable(RASModel, LaunderGibsonRSTM, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LaunderGibsonRSTM::LaunderGibsonRSTM
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            coeffDict_,
-            0.41
-        )
-    ),
-    Clg1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clg1",
-            coeffDict_,
-            1.8
-        )
-    ),
-    Clg2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Clg2",
-            coeffDict_,
-            0.6
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    Cs_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cs",
-            coeffDict_,
-            0.25
-        )
-    ),
-    Ceps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Ceps",
-            coeffDict_,
-            0.15
-        )
-    ),
-    sigmaR_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaR",
-            coeffDict_,
-            0.81967
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-    C1Ref_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1Ref",
-            coeffDict_,
-            0.5
-        )
-    ),
-    C2Ref_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2Ref",
-            coeffDict_,
-            0.3
-        )
-    ),
-    couplingFactor_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "couplingFactor",
-            coeffDict_,
-            0.0
-        )
-    ),
-
-    n_(wallDist::New(mesh_).n()),
-    y_(wallDist::New(mesh_).y()),
-
-    R_
-    (
-        IOobject
-        (
-            "R",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateR("R", mesh_)
-    ),
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-    {
-        FatalErrorIn
-        (
-            "LaunderGibsonRSTM::LaunderGibsonRSTM"
-            "(const volVectorField& U, const surfaceScalarField& phi,"
-            "transportModel& transport)"
-        )   << "couplingFactor = " << couplingFactor_
-            << " is not in range 0 - 1" << nl
-            << exit(FatalError);
-    }
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> LaunderGibsonRSTM::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            R_ - nu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevReff(volVectorField& U) const
-{
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div(R_ + couplingFactor_*nut_*fvc::grad(U), "div(R)")
-          + fvc::laplacian
-            (
-                (1.0 - couplingFactor_)*nut_,
-                U,
-                "laplacian(nuEff,U)"
-            )
-          - fvm::laplacian(nuEff(), U)
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(R_)
-          + fvc::laplacian(nut_, U, "laplacian(nuEff,U)")
-          - fvm::laplacian(nuEff(), U)
-        );
-    }
-}
-
-
-tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    if (couplingFactor_.value() > 0.0)
-    {
-        return
-        (
-            fvc::div
-            (
-                rho*R_ + couplingFactor_*(rho*nut_)*fvc::grad(U),
-                "div((rho*R))"
-            )
-          + fvc::laplacian
-            (
-                (1.0 - couplingFactor_)*rho*nut_,
-                U,
-                "laplacian(muEff,U)"
-            )
-          - fvm::laplacian(muEff, U)
-        );
-    }
-    else
-    {
-        return
-        (
-            fvc::div(rho*R_)
-          + fvc::laplacian(rho*nut_, U, "laplacian(muEff,U)")
-          - fvm::laplacian(muEff, U)
-        );
-    }
-}
-
-
-bool LaunderGibsonRSTM::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(coeffDict());
-        Clg1_.readIfPresent(coeffDict());
-        Clg2_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        Cs_.readIfPresent(coeffDict());
-        Ceps_.readIfPresent(coeffDict());
-        sigmaR_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-        C1Ref_.readIfPresent(coeffDict());
-        C2Ref_.readIfPresent(coeffDict());
-
-        couplingFactor_.readIfPresent(coeffDict());
-
-        if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
-        {
-            FatalErrorIn("LaunderGibsonRSTM::read()")
-                << "couplingFactor = " << couplingFactor_
-                << " is not in range 0 - 1"
-                << exit(FatalError);
-        }
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void LaunderGibsonRSTM::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        return;
-    }
-
-    volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
-    volScalarField G(GName(), 0.5*mag(tr(P)));
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(epsilon_)
-      + fvm::div(phi_, epsilon_)
-    //- fvm::laplacian(Ceps*(k_/epsilon_)*R_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1_*G*epsilon_/k_
-      - fvm::Sp(C2_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Reynolds stress equation
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-                P[faceCelli] *=
-                    min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 1.0);
-            }
-        }
-    }
-
-    const volSymmTensorField reflect
-    (
-        C1Ref_*epsilon_/k_*R_ - C2Ref_*Clg2_*dev(P)
-    );
-
-    tmp<fvSymmTensorMatrix> REqn
-    (
-        fvm::ddt(R_)
-      + fvm::div(phi_, R_)
-    //- fvm::laplacian(Cs*(k_/epsilon_)*R_, R_)
-      - fvm::laplacian(DREff(), R_)
-      + fvm::Sp(Clg1_*epsilon_/k_, R_)
-      ==
-        P
-      + (2.0/3.0*(Clg1_ - 1)*I)*epsilon_
-      - Clg2_*dev(P)
-
-        // wall reflection terms
-      + symm
-        (
-            I*((n_ & reflect) & n_)
-          - 1.5*(n_*(reflect & n_)
-          + (n_ & reflect)*n_)
-        )*pow(Cmu_, 0.75)*pow(k_, 1.5)/(kappa_*y_*epsilon_)
-    );
-
-    REqn().relax();
-    solve(REqn);
-
-    R_.max
-    (
-        dimensionedSymmTensor
-        (
-            "zero",
-            R_.dimensions(),
-            symmTensor
-            (
-                kMin_.value(), -GREAT, -GREAT,
-                kMin_.value(), -GREAT,
-                kMin_.value()
-            )
-        )
-    );
-
-    k_ == 0.5*tr(R_);
-    bound(k_, kMin_);
-
-
-    // Re-calculate turbulent viscosity
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-
-    // Correct wall shear stresses
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            symmTensorField& Rw = R_.boundaryField()[patchi];
-
-            const scalarField& nutw = nut_.boundaryField()[patchi];
-
-            const vectorField snGradU(U_.boundaryField()[patchi].snGrad());
-
-            const vectorField& faceAreas
-                = mesh_.Sf().boundaryField()[patchi];
-
-            const scalarField& magFaceAreas
-                = mesh_.magSf().boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                // Calculate near-wall velocity gradient
-                tensor gradUw
-                    = (faceAreas[facei]/magFaceAreas[facei])*snGradU[facei];
-
-                // Calculate near-wall shear-stress tensor
-                tensor tauw = -nutw[facei]*2*symm(gradUw);
-
-                // Reset the shear components of the stress tensor
-                Rw[facei].xy() = tauw.xy();
-                Rw[facei].xz() = tauw.xz();
-                Rw[facei].yz() = tauw.yz();
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
deleted file mode 100644
index 921e2f468..000000000
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ /dev/null
@@ -1,216 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::RASModels::LaunderGibsonRSTM
-
-Group
-    grpIcoRASTurbulence
-
-Description
-    Launder-Gibson Reynolds stress turbulence model for incompressible flows.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        LaunderGibsonRSTMCoeffs
-        {
-            Cmu         0.09;
-            kappa       0.41;
-            Clg1        1.8;
-            Clg2        0.6;
-            C1          1.44;
-            C2          1.92;
-            C1Ref       0.5;
-            C2Ref       0.3;
-            Cs          0.25;
-            Ceps        0.15;
-            sigmaEps    1.3;
-            sigmaR      0.81967;
-            couplingFactor  0.0;
-        }
-    \endverbatim
-
-SourceFiles
-    LaunderGibsonRSTM.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LaunderGibsonRSTM_H
-#define LaunderGibsonRSTM_H
-
-#include "RASModel.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LaunderGibsonRSTM Declaration
-\*---------------------------------------------------------------------------*/
-
-class LaunderGibsonRSTM
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar kappa_;
-
-            dimensionedScalar Clg1_;
-            dimensionedScalar Clg2_;
-
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar Cs_;
-            dimensionedScalar Ceps_;
-            dimensionedScalar sigmaR_;
-            dimensionedScalar sigmaEps_;
-
-            dimensionedScalar C1Ref_;
-            dimensionedScalar C2Ref_;
-
-            dimensionedScalar couplingFactor_;
-
-
-        // Fields
-
-            const volVectorField& n_;
-            const volScalarField& y_;
-
-            volSymmTensorField R_;
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField nut_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LaunderGibsonRSTM");
-
-    // Constructors
-
-        //- Construct from components
-        LaunderGibsonRSTM
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~LaunderGibsonRSTM()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
-
-        //- Return the effective diffusivity for R
-        tmp<volScalarField> DREff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DREff", nut_/sigmaR_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const
-        {
-            return R_;
-        }
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
deleted file mode 100644
index 9c451b4ce..000000000
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ /dev/null
@@ -1,309 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LaunderSharmaKE.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LaunderSharmaKE, 0);
-addToRunTimeSelectionTable(RASModel, LaunderSharmaKE, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> LaunderSharmaKE::fMu() const
-{
-    return exp(-3.4/sqr(scalar(1) + sqr(k_)/(nu()*epsilonTilda_)/50.0));
-}
-
-
-tmp<volScalarField> LaunderSharmaKE::f2() const
-{
-    return
-        scalar(1)
-      - 0.3*exp(-min(sqr(sqr(k_)/(nu()*epsilonTilda_)), scalar(50.0)));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-LaunderSharmaKE::LaunderSharmaKE
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    epsilonTilda_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateLowReNut("nut", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilonTilda_, epsilonMin_);
-
-    nut_ = Cmu_*fMu()*sqr(k_)/epsilonTilda_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> LaunderSharmaKE::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> LaunderSharmaKE::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> LaunderSharmaKE::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool LaunderSharmaKE::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void LaunderSharmaKE::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        return;
-    }
-
-    tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
-
-    volScalarField G(GName(), nut_*S2);
-
-    const volScalarField E(2.0*nu()*nut_*fvc::magSqrGradGrad(U_));
-    const volScalarField D(2.0*nu()*magSqr(fvc::grad(sqrt(k_))));
-
-
-    // Dissipation rate equation
-
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(epsilonTilda_)
-      + fvm::div(phi_, epsilonTilda_)
-      - fvm::laplacian(DepsilonEff(), epsilonTilda_)
-     ==
-        C1_*G*epsilonTilda_/k_
-      - fvm::Sp(C2_*f2()*epsilonTilda_/k_, epsilonTilda_)
-      + E
-    );
-
-    epsEqn().relax();
-    solve(epsEqn);
-    bound(epsilonTilda_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G - fvm::Sp((epsilonTilda_ + D)/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    nut_ == Cmu_*fMu()*sqr(k_)/epsilonTilda_;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
deleted file mode 100644
index 0d628a747..000000000
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ /dev/null
@@ -1,195 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::RASModels::LaunderSharmaKE
-
-Group
-    grpIcoRASTurbulence
-
-Description
-    Launder and Sharma low-Reynolds k-epsilon turbulence model for
-    incompressible flows.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        LaunderSharmaKECoeffs
-        {
-            Cmu         0.09;
-            C1          1.44;
-            C2          1.92;
-            C3          -0.33;
-            sigmaEps    1.3;
-        }
-    \endverbatim
-
-SourceFiles
-    LaunderSharmaKE.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LaunderSharmaKE_H
-#define LaunderSharmaKE_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class LaunderSharmaKE Declaration
-\*---------------------------------------------------------------------------*/
-
-class LaunderSharmaKE
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar sigmaEps_;
-
-
-        // Fields
-
-            volScalarField k_;
-            volScalarField epsilonTilda_;
-            volScalarField nut_;
-
-
-    // Protected Member Functions
-
-        tmp<volScalarField> fMu() const;
-        tmp<volScalarField> f2() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LaunderSharmaKE");
-
-    // Constructors
-
-        //- Construct from components
-        LaunderSharmaKE
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~LaunderSharmaKE()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nut_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Note that epsilonTilda is returned as epsilon.
-        //  This is the appropriate variable for most purposes.
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilonTilda_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files
deleted file mode 100644
index bb0258c6f..000000000
--- a/src/turbulenceModels/incompressible/RAS/Make/files
+++ /dev/null
@@ -1,66 +0,0 @@
-RASModel/RASModel.C
-
-laminar/laminar.C
-kEpsilon/kEpsilon.C
-RNGkEpsilon/RNGkEpsilon.C
-realizableKE/realizableKE.C
-kOmega/kOmega.C
-kOmegaSST/kOmegaSST.C
-SpalartAllmaras/SpalartAllmaras.C
-LRR/LRR.C
-LaunderGibsonRSTM/LaunderGibsonRSTM.C
-LaunderSharmaKE/LaunderSharmaKE.C
-qZeta/qZeta.C
-LienCubicKE/LienCubicKE.C
-LienCubicKELowRe/LienCubicKELowRe.C
-NonlinearKEShih/NonlinearKEShih.C
-LienLeschzinerLowRe/LienLeschzinerLowRe.C
-LamBremhorstKE/LamBremhorstKE.C
-kkLOmega/kkLOmega.C
-v2f/v2f.C
-
-/* Wall functions */
-wallFunctions = derivedFvPatchFields/wallFunctions
-
-nutWallFunctions = $(wallFunctions)/nutWallFunctions
-$(nutWallFunctions)/nutWallFunction/nutWallFunctionFvPatchScalarField.C
-
-$(nutWallFunctions)/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
-
-$(nutWallFunctions)/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
-
-epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
-$(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
-$(epsilonWallFunctions)/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
-
-fWallFunctions = $(wallFunctions)/fWallFunctions
-$(fWallFunctions)/fWallFunction/fWallFunctionFvPatchScalarField.C
-
-omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
-$(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
-
-kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
-$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
-$(kqRWallFunctions)/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
-
-alphatWallFunctions = $(wallFunctions)/alphatWallFunctions
-$(alphatWallFunctions)/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
-
-v2WallFunctions = $(wallFunctions)/v2WallFunctions
-$(v2WallFunctions)/v2WallFunction/v2WallFunctionFvPatchScalarField.C
-
-/* Patch fields */
-derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
-derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
-derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
-
-backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
-
-LIB = $(FOAM_LIBBIN)/libincompressibleRASModels
diff --git a/src/turbulenceModels/incompressible/RAS/Make/options b/src/turbulenceModels/incompressible/RAS/Make/options
deleted file mode 100644
index a5242e05e..000000000
--- a/src/turbulenceModels/incompressible/RAS/Make/options
+++ /dev/null
@@ -1,11 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -lincompressibleTurbulenceModel \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
deleted file mode 100644
index 47f80f23e..000000000
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ /dev/null
@@ -1,206 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "RASModel.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(RASModel, 0);
-defineRunTimeSelectionTable(RASModel, dictionary);
-addToRunTimeSelectionTable(turbulenceModel, RASModel, turbulenceModel);
-
-// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
-
-void RASModel::printCoeffs()
-{
-    if (printCoeffs_)
-    {
-        Info<< type() << "Coeffs" << coeffDict_ << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-RASModel::RASModel
-(
-    const word& type,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-:
-    turbulenceModel(U, phi, transport, turbulenceModelName),
-
-    IOdictionary
-    (
-        IOobject
-        (
-            "RASProperties",
-            U.time().constant(),
-            U.db(),
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    ),
-
-    turbulence_(lookup("turbulence")),
-    printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subOrEmptyDict(type + "Coeffs")),
-
-    kMin_("kMin", sqr(dimVelocity), SMALL),
-    epsilonMin_("epsilonMin", kMin_.dimensions()/dimTime, SMALL),
-    omegaMin_("omegaMin", dimless/dimTime, SMALL)
-{
-    kMin_.readIfPresent(*this);
-    epsilonMin_.readIfPresent(*this);
-    omegaMin_.readIfPresent(*this);
-
-    // Force the construction of the mesh deltaCoeffs which may be needed
-    // for the construction of the derived models and BCs
-    mesh_.deltaCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<RASModel> RASModel::New
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "RASProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("RASModel")
-    );
-
-    Info<< "Selecting RAS turbulence model " << modelType << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "RASModel::New"
-            "("
-                "const volVectorField&, "
-                "const surfaceScalarField&, "
-                "transportModel&, "
-                "const word&"
-            ")"
-        )   << "Unknown RASModel type "
-            << modelType << nl << nl
-            << "Valid RASModel types:" << endl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<RASModel>
-    (
-        cstrIter()(U, phi, transport, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void RASModel::correct()
-{
-    turbulenceModel::correct();
-}
-
-
-bool RASModel::read()
-{
-    //if (regIOobject::read())
-
-    // Bit of trickery : we are both IOdictionary ('RASProperties') and
-    // an regIOobject from the turbulenceModel level. Problem is to distinguish
-    // between the two - we only want to reread the IOdictionary.
-
-    bool ok = IOdictionary::readData
-    (
-        IOdictionary::readStream
-        (
-            IOdictionary::type()
-        )
-    );
-    IOdictionary::close();
-
-    if (ok)
-    {
-        lookup("turbulence") >> turbulence_;
-
-        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
-        {
-            coeffDict_ <<= *dictPtr;
-        }
-
-        kMin_.readIfPresent(*this);
-        epsilonMin_.readIfPresent(*this);
-        omegaMin_.readIfPresent(*this);
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
deleted file mode 100644
index 08c63d220..000000000
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ /dev/null
@@ -1,243 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Namespace
-    Foam::incompressible::RASModels
-
-Group
-    grpIcoRASTurbulence
-
-Description
-    Namespace for incompressible RAS turbulence models.
-
-Class
-    Foam::incompressible::RASModel
-
-Description
-    Abstract base class for incompressible turbulence models.
-
-SourceFiles
-    RASModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef RASModel_H
-#define RASModel_H
-
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "fvm.H"
-#include "fvc.H"
-#include "fvMatrices.H"
-#include "incompressible/transportModel/transportModel.H"
-#include "IOdictionary.H"
-#include "Switch.H"
-#include "bound.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class RASModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class RASModel
-:
-    public turbulenceModel,
-    public IOdictionary
-{
-
-protected:
-
-    // Protected data
-
-        //- Turbulence on/off flag
-        Switch turbulence_;
-
-        //- Flag to print the model coeffs at run-time
-        Switch printCoeffs_;
-
-        //- Model coefficients dictionary
-        dictionary coeffDict_;
-
-        //- Lower limit of k
-        dimensionedScalar kMin_;
-
-        //- Lower limit of epsilon
-        dimensionedScalar epsilonMin_;
-
-        //- Lower limit for omega
-        dimensionedScalar omegaMin_;
-
-
-    // Protected Member Functions
-
-        //- Print model coefficients
-        virtual void printCoeffs();
-
-
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        RASModel(const RASModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const RASModel&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("RASModel");
-
-
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            RASModel,
-            dictionary,
-            (
-                const volVectorField& U,
-                const surfaceScalarField& phi,
-                const transportModel& transport,
-                const word& turbulenceModelName
-            ),
-            (U, phi, transport, turbulenceModelName)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        RASModel
-        (
-            const word& type,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected RAS model
-        static autoPtr<RASModel> New
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName
-        );
-
-
-    //- Destructor
-    virtual ~RASModel()
-    {}
-
-
-    // Member Functions
-
-        // Access
-
-            //- Return the lower allowable limit for k (default: SMALL)
-            const dimensionedScalar& kMin() const
-            {
-                return kMin_;
-            }
-
-            //- Return the lower allowable limit for epsilon (default: SMALL)
-            const dimensionedScalar& epsilonMin() const
-            {
-                return epsilonMin_;
-            }
-
-            //- Return the lower allowable limit for omega (default: SMALL)
-            const dimensionedScalar& omegaMin() const
-            {
-                return omegaMin_;
-            }
-
-            //- Allow kMin to be changed
-            dimensionedScalar& kMin()
-            {
-                return kMin_;
-            }
-
-            //- Allow epsilonMin to be changed
-            dimensionedScalar& epsilonMin()
-            {
-                return epsilonMin_;
-            }
-
-            //- Allow omegaMin to be changed
-            dimensionedScalar& omegaMin()
-            {
-                return omegaMin_;
-            }
-
-            //- Const access to the coefficients dictionary
-            virtual const dictionary& coeffDict() const
-            {
-                return coeffDict_;
-            }
-
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> nuEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("nuEff", nut() + nu())
-            );
-        }
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModelDoc.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModelDoc.H
deleted file mode 100644
index 216165664..000000000
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModelDoc.H
+++ /dev/null
@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpIcoRASTurbulence Incompressible RAS turbulence
-@{
-    \ingroup grpIcoTurbulence
-    This group contains incompressible RAS models.
-@}
-    
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
deleted file mode 100644
index 5612ead2d..000000000
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ /dev/null
@@ -1,469 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "SpalartAllmaras.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(SpalartAllmaras, 0);
-addToRunTimeSelectionTable(RASModel, SpalartAllmaras, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> SpalartAllmaras::chi() const
-{
-    return nuTilda_/nu();
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv1(const volScalarField& chi) const
-{
-    const volScalarField chi3(pow3(chi));
-    return chi3/(chi3 + pow3(Cv1_));
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv2
-(
-    const volScalarField& chi,
-    const volScalarField& fv1
-) const
-{
-    if (ashfordCorrection_)
-    {
-        return 1.0/pow3(scalar(1) + chi/Cv2_);
-    }
-    else
-    {
-        return 1.0 - chi/(1.0 + chi*fv1);
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fv3
-(
-    const volScalarField& chi,
-    const volScalarField& fv1
-) const
-{
-    if (ashfordCorrection_)
-    {
-        const volScalarField chiByCv2((1/Cv2_)*chi);
-
-        return
-            (scalar(1) + chi*fv1)
-           *(1/Cv2_)
-           *(3*(scalar(1) + chiByCv2) + sqr(chiByCv2))
-           /pow3(scalar(1) + chiByCv2);
-    }
-    else
-    {
-        return tmp<volScalarField>
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    "fv3",
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                mesh_,
-                dimensionedScalar("fv3", dimless, 1),
-                zeroGradientFvPatchScalarField::typeName
-            )
-        );
-    }
-}
-
-
-tmp<volScalarField> SpalartAllmaras::fw(const volScalarField& Stilda) const
-{
-    volScalarField r
-    (
-        min
-        (
-            nuTilda_
-           /(
-               max
-               (
-                   Stilda,
-                   dimensionedScalar("SMALL", Stilda.dimensions(), SMALL)
-               )
-              *sqr(kappa_*y_)
-            ),
-            scalar(10.0)
-        )
-    );
-    r.boundaryField() == 0.0;
-
-    const volScalarField g(r + Cw2_*(pow6(r) - r));
-
-    return g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-SpalartAllmaras::SpalartAllmaras
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    sigmaNut_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaNut",
-            coeffDict_,
-            0.66666
-        )
-    ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            coeffDict_,
-            0.41
-        )
-    ),
-
-    Cb1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb1",
-            coeffDict_,
-            0.1355
-        )
-    ),
-    Cb2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cb2",
-            coeffDict_,
-            0.622
-        )
-    ),
-    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
-    Cw2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw2",
-            coeffDict_,
-            0.3
-        )
-    ),
-    Cw3_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cw3",
-            coeffDict_,
-            2.0
-        )
-    ),
-    Cv1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv1",
-            coeffDict_,
-            7.1
-        )
-    ),
-    Cv2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cv2",
-            coeffDict_,
-            5.0
-        )
-    ),
-
-    ashfordCorrection_(coeffDict_.lookupOrDefault("ashfordCorrection", true)),
-
-    nuTilda_
-    (
-        IOobject
-        (
-            "nuTilda",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_
-    ),
-
-    y_(wallDist::New(mesh_).y())
-{
-    printCoeffs();
-
-    if (ashfordCorrection_)
-    {
-        Info<< "    Employing Ashford correction" << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> SpalartAllmaras::DnuTildaEff() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField("DnuTildaEff", (nuTilda_ + nu())/sigmaNut_)
-    );
-}
-
-
-tmp<volScalarField> SpalartAllmaras::k() const
-{
-    WarningIn("tmp<volScalarField> SpalartAllmaras::k() const")
-        << "Turbulence kinetic energy not defined for Spalart-Allmaras model. "
-        << "Returning zero field" << endl;
-
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_
-            ),
-            mesh_,
-            dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
-        )
-    );
-}
-
-
-tmp<volScalarField> SpalartAllmaras::epsilon() const
-{
-    WarningIn("tmp<volScalarField> SpalartAllmaras::epsilon() const")
-        << "Turbulence kinetic energy dissipation rate not defined for "
-        << "Spalart-Allmaras model. Returning zero field"
-        << endl;
-
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "epsilon",
-                runTime_.timeName(),
-                mesh_
-            ),
-            mesh_,
-            dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k() - nut()*twoSymm(fvc::grad(U_))
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> SpalartAllmaras::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
-{
-    const volScalarField nuEff_(nuEff());
-
-    return
-    (
-      - fvm::laplacian(nuEff_, U)
-      - fvc::div(nuEff_*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool SpalartAllmaras::read()
-{
-    if (RASModel::read())
-    {
-        sigmaNut_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(coeffDict());
-
-        Cb1_.readIfPresent(coeffDict());
-        Cb2_.readIfPresent(coeffDict());
-        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
-        Cw2_.readIfPresent(coeffDict());
-        Cw3_.readIfPresent(coeffDict());
-        Cv1_.readIfPresent(coeffDict());
-        Cv2_.readIfPresent(coeffDict());
-
-        ashfordCorrection_.readIfPresent("ashfordCorrection", coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void SpalartAllmaras::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        // Re-calculate viscosity
-        nut_ = nuTilda_*fv1(this->chi());
-        nut_.correctBoundaryConditions();
-
-        return;
-    }
-
-    const volScalarField chi(this->chi());
-    const volScalarField fv1(this->fv1(chi));
-
-    const volScalarField Stilda
-    (
-        fv3(chi, fv1)*::sqrt(2.0)*mag(skew(fvc::grad(U_)))
-      + fv2(chi, fv1)*nuTilda_/sqr(kappa_*y_)
-    );
-
-    tmp<fvScalarMatrix> nuTildaEqn
-    (
-        fvm::ddt(nuTilda_)
-      + fvm::div(phi_, nuTilda_)
-      - fvm::laplacian(DnuTildaEff(), nuTilda_)
-      - Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
-     ==
-        Cb1_*Stilda*nuTilda_
-      - fvm::Sp(Cw1_*fw(Stilda)*nuTilda_/sqr(y_), nuTilda_)
-    );
-
-    nuTildaEqn().relax();
-    solve(nuTildaEqn);
-    bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
-    nuTilda_.correctBoundaryConditions();
-
-    // Re-calculate viscosity
-    nut_.internalField() = fv1*nuTilda_.internalField();
-    nut_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
deleted file mode 100644
index df20a315f..000000000
--- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+++ /dev/null
@@ -1,286 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-#include "volFields.H"
-#include "calculatedFvPatchField.H"
-#include "nutkWallFunctionFvPatchScalarField.H"
-#include "nutLowReWallFunctionFvPatchScalarField.H"
-#include "epsilonWallFunctionFvPatchScalarField.H"
-#include "kqRWallFunctionFvPatchField.H"
-#include "omegaWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-tmp<volScalarField> autoCreateNut
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject nutHeader
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-
-    if (nutHeader.headerOk())
-    {
-        return tmp<volScalarField>(new volScalarField(nutHeader, mesh));
-    }
-    else
-    {
-        Info<< "--> Creating " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        const fvBoundaryMesh& bm = mesh.boundary();
-
-        wordList nutBoundaryTypes(bm.size());
-
-        forAll(bm, patchI)
-        {
-            if (isA<wallFvPatch>(bm[patchI]))
-            {
-                nutBoundaryTypes[patchI] =
-                    nutkWallFunctionFvPatchScalarField::typeName;
-            }
-            else
-            {
-                nutBoundaryTypes[patchI] =
-                    calculatedFvPatchField<scalar>::typeName;
-            }
-        }
-
-        tmp<volScalarField> nut
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                dimensionedScalar("zero", dimArea/dimTime, 0.0),
-                nutBoundaryTypes
-            )
-        );
-
-        Info<< "    Writing new " << fieldName << endl;
-        nut().write();
-
-        return nut;
-    }
-}
-
-
-tmp<volScalarField> autoCreateLowReNut
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject nutHeader
-    (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-
-    if (nutHeader.headerOk())
-    {
-        return tmp<volScalarField>(new volScalarField(nutHeader, mesh));
-    }
-    else
-    {
-        Info<< "--> Creating " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        const fvBoundaryMesh& bm = mesh.boundary();
-
-        wordList nutBoundaryTypes(bm.size());
-
-        forAll(bm, patchI)
-        {
-            if (isA<wallFvPatch>(bm[patchI]))
-            {
-                nutBoundaryTypes[patchI] =
-                    nutLowReWallFunctionFvPatchScalarField::typeName;
-            }
-            else
-            {
-                nutBoundaryTypes[patchI] =
-                    calculatedFvPatchField<scalar>::typeName;
-            }
-        }
-
-        tmp<volScalarField> nut
-        (
-            new volScalarField
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                dimensionedScalar("zero", dimArea/dimTime, 0.0),
-                nutBoundaryTypes
-            )
-        );
-
-        Info<< "    Writing new " << fieldName << endl;
-        nut().write();
-
-        return nut;
-    }
-}
-
-
-tmp<volScalarField> autoCreateEpsilon
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            epsilonWallFunctionFvPatchScalarField
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volScalarField> autoCreateOmega
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            omegaWallFunctionFvPatchScalarField
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volScalarField> autoCreateK
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            kqRWallFunctionFvPatchField<scalar>
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volScalarField> autoCreateQ
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            scalar,
-            kqRWallFunctionFvPatchField<scalar>
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-tmp<volSymmTensorField> autoCreateR
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    return
-        autoCreateWallFunctionField
-        <
-            symmTensor,
-            kqRWallFunctionFvPatchField<symmTensor>
-        >
-        (
-            fieldName,
-            mesh
-        );
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
-
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
deleted file mode 100644
index 3eac48808..000000000
--- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
+++ /dev/null
@@ -1,122 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-Class
-    Foam::incompressible
-
-Description
-    Auto creation of fields to provide backwards compatibility with
-    runtime selectable wall functions
-
-SourceFiles
-    backwardsCompatibilityWallFunctions.C
-    backwardsCompatibilityWallFunctionsTemplates.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef backwardsCompatibilityWallFunctions_H
-#define backwardsCompatibilityWallFunctions_H
-
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-    //- nut
-    tmp<volScalarField> autoCreateNut
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- nut for Low-Reynolds number models
-    tmp<volScalarField> autoCreateLowReNut
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- epsilon
-    tmp<volScalarField> autoCreateEpsilon
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- omega
-    tmp<volScalarField> autoCreateOmega
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- k
-    tmp<volScalarField> autoCreateK
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- Q
-    tmp<volScalarField> autoCreateQ
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- R
-    tmp<volSymmTensorField> autoCreateR
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-    //- Helper function to create the new field
-    template<class Type, class PatchType>
-    tmp<GeometricField<Type, fvPatchField, volMesh> >
-    autoCreateWallFunctionField
-    (
-        const word& fieldName,
-        const fvMesh& mesh
-    );
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "backwardsCompatibilityWallFunctionsTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
deleted file mode 100644
index e414d8053..000000000
--- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "backwardsCompatibilityWallFunctions.H"
-#include "Time.H"
-#include "OSspecific.H"
-
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type, class PatchType>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
-autoCreateWallFunctionField
-(
-    const word& fieldName,
-    const fvMesh& mesh
-)
-{
-    IOobject nutHeader
-    (
-        "nut",
-        mesh.time().timeName(),
-        mesh,
-        IOobject::MUST_READ
-    );
-
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
-
-    if (nutHeader.headerOk())
-    {
-        return tmp<fieldType>
-        (
-            new fieldType
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh
-            )
-        );
-    }
-    else
-    {
-        Info<< "--> Upgrading " << fieldName
-            << " to employ run-time selectable wall functions" << endl;
-
-        // Read existing field
-        IOobject ioObj
-        (
-            fieldName,
-            mesh.time().timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        tmp<fieldType> fieldOrig
-        (
-            new fieldType
-            (
-                ioObj,
-                mesh
-            )
-        );
-
-        // rename file
-        Info<< "    Backup original " << fieldName << " to "
-            << fieldName << ".old" << endl;
-        mvBak(ioObj.objectPath(), "old");
-
-
-        PtrList<fvPatchField<Type> > newPatchFields(mesh.boundary().size());
-
-        forAll(newPatchFields, patchI)
-        {
-            if (isA<wallFvPatch>(mesh.boundary()[patchI]))
-            {
-                newPatchFields.set
-                (
-                    patchI,
-                    new PatchType
-                    (
-                        mesh.boundary()[patchI],
-                        fieldOrig().dimensionedInternalField()
-                    )
-                );
-                newPatchFields[patchI] == fieldOrig().boundaryField()[patchI];
-            }
-            else
-            {
-                newPatchFields.set
-                (
-                    patchI,
-                    fieldOrig().boundaryField()[patchI].clone()
-                );
-            }
-        }
-
-        tmp<fieldType> fieldNew
-        (
-            new fieldType
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh,
-                fieldOrig().dimensions(),
-                fieldOrig().internalField(),
-                newPatchFields
-            )
-        );
-
-        Info<< "    Writing updated " << fieldName << endl;
-        fieldNew().write();
-
-        return fieldNew;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
deleted file mode 100644
index a1bf04e96..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ /dev/null
@@ -1,142 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "atmBoundaryLayerInletEpsilonFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-atmBoundaryLayerInletEpsilonFvPatchScalarField::
-atmBoundaryLayerInletEpsilonFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    atmBoundaryLayer()
-{}
-
-
-atmBoundaryLayerInletEpsilonFvPatchScalarField::
-atmBoundaryLayerInletEpsilonFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    atmBoundaryLayer(patch().Cf(), dict)
-{
-    scalarField::operator=(epsilon(patch().Cf()));
-}
-
-
-atmBoundaryLayerInletEpsilonFvPatchScalarField::
-atmBoundaryLayerInletEpsilonFvPatchScalarField
-(
-    const atmBoundaryLayerInletEpsilonFvPatchScalarField& psf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(psf, p, iF, mapper),
-    atmBoundaryLayer(psf, mapper)
-{}
-
-
-atmBoundaryLayerInletEpsilonFvPatchScalarField::
-atmBoundaryLayerInletEpsilonFvPatchScalarField
-(
-    const atmBoundaryLayerInletEpsilonFvPatchScalarField& psf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(psf, iF),
-    atmBoundaryLayer(psf)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void atmBoundaryLayerInletEpsilonFvPatchScalarField::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    fixedValueFvPatchScalarField::autoMap(m);
-    atmBoundaryLayer::autoMap(m);
-}
-
-
-void atmBoundaryLayerInletEpsilonFvPatchScalarField::rmap
-(
-    const fvPatchScalarField& psf,
-    const labelList& addr
-)
-{
-    fixedValueFvPatchScalarField::rmap(psf, addr);
-
-    const atmBoundaryLayerInletEpsilonFvPatchScalarField& blpsf =
-        refCast<const atmBoundaryLayerInletEpsilonFvPatchScalarField>(psf);
-
-    atmBoundaryLayer::rmap(blpsf, addr);
-}
-
-
-void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchScalarField::write(os);
-    atmBoundaryLayer::write(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    atmBoundaryLayerInletEpsilonFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
deleted file mode 100644
index 4cbda74cf..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
+++ /dev/null
@@ -1,177 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::incompressible::atmBoundaryLayerInletEpsilonFvPatchScalarField
-
-Group
-    grpIcoRASBoundaryConditions grpInletBoundaryConditions
-
-Description
-    This boundary condition specifies an inlet value for the turbulence
-    dissipation, \f$\epsilon\f$, appropriate for atmospheric boundary layers.
-
-    See Foam::incompressible::atmBoundaryLayer for details.
-
-    Example of the boundary condition specification:
-    \verbatim
-    ground
-    {
-        type            atmBoundaryLayerInletEpsilon;
-        z               (0 0 1);
-        Uref            10.0;
-        Zref            20.0;
-        z0              uniform 0.1;
-        zGround         uniform 0.0;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::incompressible::atmBoundaryLayer,
-    Foam::incompressible::atmBoundaryLayerInletVelocityFvPatchVectorField,
-    Foam::incompressible::atmBoundaryLayerInletKFvPatchScalarField
-
-SourceFiles
-    atmBoundaryLayerInletEpsilonFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef atmBoundaryLayerInletEpsilonFvPatchScalarField_H
-#define atmBoundaryLayerInletEpsilonFvPatchScalarField_H
-
-#include "fvPatchFields.H"
-#include "fixedValueFvPatchFields.H"
-#include "atmBoundaryLayer.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-        Class atmBoundaryLayerInletEpsilonFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class atmBoundaryLayerInletEpsilonFvPatchScalarField
-:
-    public fixedValueFvPatchScalarField,
-    public atmBoundaryLayer
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("atmBoundaryLayerInletEpsilon");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        atmBoundaryLayerInletEpsilonFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        atmBoundaryLayerInletEpsilonFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  atmBoundaryLayerInletEpsilonFvPatchScalarField onto a new patch
-        atmBoundaryLayerInletEpsilonFvPatchScalarField
-        (
-            const atmBoundaryLayerInletEpsilonFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmBoundaryLayerInletEpsilonFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        atmBoundaryLayerInletEpsilonFvPatchScalarField
-        (
-            const atmBoundaryLayerInletEpsilonFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmBoundaryLayerInletEpsilonFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper&
-            );
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchScalarField&,
-                const labelList&
-            );
-
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/doc/incompressibleRASBoundaryConditionsDoc.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/doc/incompressibleRASBoundaryConditionsDoc.H
deleted file mode 100644
index c59310206..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/doc/incompressibleRASBoundaryConditionsDoc.H
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-\defgroup grpIcoRASBoundaryConditions RAS incompressible boundary conditions
-@{
-    \ingroup grpIcoRASTurbulence
-    This group contains incompressible RAS turbulence model boundary conditions
-@}
-
-\defgroup grpIcoWallFunctions RAS incompressible wall functions
-@{
-    \ingroup grpIcoRASBoundaryConditions
-    This group contains incompressible RAS turbulence model wall functions
-@}
-
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
deleted file mode 100644
index e0d6c9a8e..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ /dev/null
@@ -1,179 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulentMixingLengthDissipationRateInletFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-#include "volFields.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(0.0),
-    kName_("k")
-{
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    inletOutletFvPatchScalarField(ptf, p, iF, mapper),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookupOrDefault<word>("k", "k"))
-{
-    this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf
-)
-:
-    inletOutletFvPatchScalarField(ptf),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-turbulentMixingLengthDissipationRateInletFvPatchScalarField::
-turbulentMixingLengthDissipationRateInletFvPatchScalarField
-(
-    const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(ptf, iF),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    // Lookup Cmu corresponding to the turbulence model selected
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalar Cmu =
-        turbulence.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
-
-    const scalar Cmu75 = pow(Cmu, 0.75);
-
-    const fvPatchScalarField& kp =
-        patch().lookupPatchField<volScalarField, scalar>(kName_);
-
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
-
-    this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
-    this->valueFraction() = 1.0 - pos(phip);
-
-    inletOutletFvPatchScalarField::updateCoeffs();
-}
-
-
-void turbulentMixingLengthDissipationRateInletFvPatchScalarField::write
-(
-    Ostream& os
-) const
-{
-    fvPatchScalarField::write(os);
-    os.writeKeyword("mixingLength")
-        << mixingLength_ << token::END_STATEMENT << nl;
-    os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    turbulentMixingLengthDissipationRateInletFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
deleted file mode 100644
index 13496315d..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ /dev/null
@@ -1,203 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-
-Group
-    grpIcoRASBoundaryConditions grpInletBoundaryConditions
-
-Description
-    This boundary condition provides a turbulence dissipation, \f$\epsilon\f$
-    (epsilon) inlet condition based on a specified mixing length.  The patch
-    values are calculated using:
-
-        \f[
-            \epsilon_p = \frac{C_{\mu}^{0.75} k^{1.5}}{L}
-        \f]
-   
-    where
-
-    \vartable
-        \epsilon_p | patch epsilon values
-        C_{\mu} | Model coefficient, set to 0.09
-        k       | turbulence kinetic energy
-        L       | length scale
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        mixingLength | Length scale [m]        | yes         |
-        phi          | flux field name         | no          | phi
-        k            | turbulence kinetic energy field name | no | k
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            turbulentMixingLengthDissipationRateInlet;
-        mixingLength    0.005;
-        value           uniform 200;   // placeholder
-    }
-    \endverbatim
-
-Note
-    In the event of reverse flow, a zero-gradient condition is applied
-
-SeeAlso
-    Foam::inletOutletFvPatchField
-
-SourceFiles
-    turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef incompressibleturbulentMixingLengthDissipationRateInlet_H
-#define incompressibleturbulentMixingLengthDissipationRateInlet_H
-
-#include "inletOutletFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
- Class turbulentMixingLengthDissipationRateInletFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulentMixingLengthDissipationRateInletFvPatchScalarField
-:
-    public inletOutletFvPatchScalarField
-{
-    // Private data
-
-        //- turbulent length scale
-        scalar mixingLength_;
-
-        //- Name of the turbulent kinetic energy field
-        word kName_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("turbulentMixingLengthDissipationRateInlet");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        //  onto a new patch
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const turbulentMixingLengthDissipationRateInletFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const turbulentMixingLengthDissipationRateInletFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthDissipationRateInletFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        turbulentMixingLengthDissipationRateInletFvPatchScalarField
-        (
-            const turbulentMixingLengthDissipationRateInletFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthDissipationRateInletFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
deleted file mode 100644
index 95bdac20f..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulentMixingLengthFrequencyInletFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-#include "volFields.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(0.0),
-    kName_("undefined-k")
-{
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    inletOutletFvPatchScalarField(ptf, p, iF, mapper),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookupOrDefault<word>("k", "k"))
-{
-    this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
-
-    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
-
-    this->refValue() = 0.0;
-    this->refGrad() = 0.0;
-    this->valueFraction() = 0.0;
-}
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf
-)
-:
-    inletOutletFvPatchScalarField(ptf),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-turbulentMixingLengthFrequencyInletFvPatchScalarField::
-turbulentMixingLengthFrequencyInletFvPatchScalarField
-(
-    const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    inletOutletFvPatchScalarField(ptf, iF),
-    mixingLength_(ptf.mixingLength_),
-    kName_(ptf.kName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    // Lookup Cmu corresponding to the turbulence model selected
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-
-    const scalar Cmu =
-        turbulence.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
-
-    const scalar Cmu25 = pow(Cmu, 0.25);
-
-    const fvPatchScalarField& kp =
-        patch().lookupPatchField<volScalarField, scalar>(kName_);
-
-    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(this->phiName_);
-
-    this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
-    this->valueFraction() = 1.0 - pos(phip);
-
-    inletOutletFvPatchScalarField::updateCoeffs();
-}
-
-
-void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
-(
-    Ostream& os
-) const
-{
-    fvPatchScalarField::write(os);
-    os.writeKeyword("mixingLength")
-        << mixingLength_ << token::END_STATEMENT << nl;
-    os.writeKeyword("phi") << this->phiName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    turbulentMixingLengthFrequencyInletFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
deleted file mode 100644
index 9fdff8d95..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ /dev/null
@@ -1,203 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::turbulentMixingLengthFrequencyInletFvPatchScalarField
-
-Group
-    grpIcoRASBoundaryConditions grpInletBoundaryConditions
-
-Description
-    This boundary condition provides a turbulence specific dissipation,
-    \f$\omega\f$ (omega) inlet condition based on a specified mixing length.
-    The patch values are calculated using:
-
-        \f[
-            \omega_p = \frac{k^{0.5}}{C_{\mu}^{0.25} L}
-        \f]
-   
-    where
-
-    \vartable
-        \omega_p | patch omega values
-        C_{\mu} | Model coefficient, set to 0.09
-        k       | turbulence kinetic energy
-        L       | length scale
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        mixingLength | Length scale [m]        | yes         |
-        phi          | flux field name         | no          | phi
-        k            | turbulence kinetic energy field name | no | k
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            turbulentMixingLengthFrequencyInlet;
-        mixingLength    0.005;
-        value           uniform 200;   // placeholder
-    }
-    \endverbatim
-
-Note
-    In the event of reverse flow, a zero-gradient condition is applied
-
-SeeAlso
-    Foam::inletOutletFvPatchField
-
-
-SourceFiles
-    turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef incompressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
-#define incompressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
-
-#include "inletOutletFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-    Class turbulentMixingLengthFrequencyInletFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulentMixingLengthFrequencyInletFvPatchScalarField
-:
-    public inletOutletFvPatchScalarField
-{
-    // Private data
-
-        //- Turbulent length scale
-        scalar mixingLength_;
-
-        //- Name of the turbulent kinetic energy field
-        word kName_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("turbulentMixingLengthFrequencyInlet");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  turbulentMixingLengthFrequencyInletFvPatchScalarField
-        //  onto a new patch
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const turbulentMixingLengthFrequencyInletFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const turbulentMixingLengthFrequencyInletFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthFrequencyInletFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        turbulentMixingLengthFrequencyInletFvPatchScalarField
-        (
-            const turbulentMixingLengthFrequencyInletFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthFrequencyInletFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
-        }
-
-
-    // Member functions
-
-        //- Update the coefficients associated with the patch field
-        virtual void updateCoeffs();
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
deleted file mode 100644
index d9898beda..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,193 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "epsilonLowReWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-scalar epsilonLowReWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-void epsilonLowReWallFunctionFvPatchScalarField::calculate
-(
-    const turbulenceModel& turbulence,
-    const List<scalar>& cornerWeights,
-    const fvPatch& patch,
-    scalarField& G,
-    scalarField& epsilon
-)
-{
-    const label patchI = patch.index();
-
-    const scalarField& y = turbulence.y()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-    const scalar Cmu75 = pow(Cmu_, 0.75);
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tnu = turbulence.nu();
-    const scalarField& nuw = tnu().boundaryField()[patchI];
-
-    const tmp<volScalarField> tnut = turbulence.nut();
-    const volScalarField& nut = tnut();
-    const scalarField& nutw = nut.boundaryField()[patchI];
-
-    const fvPatchVectorField& Uw = turbulence.U().boundaryField()[patchI];
-
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    // Set epsilon and G
-    forAll(nutw, faceI)
-    {
-        label cellI = patch.faceCells()[faceI];
-
-        scalar yPlus = Cmu25*sqrt(k[cellI])*y[faceI]/nuw[faceI];
-
-        scalar w = cornerWeights[faceI];
-
-        if (yPlus > yPlusLam_)
-        {
-            epsilon[cellI] = w*Cmu75*pow(k[cellI], 1.5)/(kappa_*y[faceI]);
-        }
-        else
-        {
-            epsilon[cellI] = w*2.0*k[cellI]*nuw[faceI]/sqr(y[faceI]);
-        }
-
-        G[cellI] =
-            w
-           *(nutw[faceI] + nuw[faceI])
-           *magGradUw[faceI]
-           *Cmu25*sqrt(k[cellI])
-           /(kappa_*y[faceI]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    epsilonWallFunctionFvPatchScalarField(p, iF),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const epsilonLowReWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    epsilonWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    yPlusLam_(ptf.yPlusLam_)
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    epsilonWallFunctionFvPatchScalarField(p, iF, dict),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const epsilonLowReWallFunctionFvPatchScalarField& ewfpsf
-)
-:
-    epsilonWallFunctionFvPatchScalarField(ewfpsf),
-    yPlusLam_(ewfpsf.yPlusLam_)
-{}
-
-
-epsilonLowReWallFunctionFvPatchScalarField::
-epsilonLowReWallFunctionFvPatchScalarField
-(
-    const epsilonLowReWallFunctionFvPatchScalarField& ewfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    epsilonWallFunctionFvPatchScalarField(ewfpsf, iF),
-    yPlusLam_(ewfpsf.yPlusLam_)
-{}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    epsilonLowReWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 778fffcfd..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,194 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 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/>.
-
-Class
-    Foam::incompressible::epsilonLowReWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulence dissipation wall function
-    condition for low- and high-Reynolds number turbulent flow cases.
-
-    The condition can be applied to wall boundaries, whereby it inserts near
-    wall epsilon values directly into the epsilon equation to act as a
-    constraint.
-
-    The model operates in two modes, based on the computed laminar-to-turbulent
-    switch-over y+ value derived from kappa and E.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            epsilonLowReWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::epsilonWallFunctionFvPatchScalarField
-
-SourceFiles
-    epsilonLowReWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef epsilonLowReWallFunctionFvPatchScalarField_H
-#define epsilonLowReWallFunctionFvPatchScalarField_H
-
-#include "epsilonWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-           Class epsilonLowReWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class epsilonLowReWallFunctionFvPatchScalarField
-:
-    public epsilonWallFunctionFvPatchScalarField
-{
-
-protected:
-
-    // Protected data
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        scalar yPlusLam(const scalar kappa, const scalar E);
-
-        //- Calculate the epsilon and G
-        virtual void calculate
-        (
-            const turbulenceModel& turbulence,
-            const List<scalar>& cornerWeights,
-            const fvPatch& patch,
-            scalarField& G,
-            scalarField& epsilon
-        );
-
-
-public:
-
-    //- Runtime type information
-    TypeName("epsilonLowReWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  epsilonLowReWallFunctionFvPatchScalarField
-        //  onto a new patch
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const epsilonLowReWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const epsilonLowReWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        epsilonLowReWallFunctionFvPatchScalarField
-        (
-            const epsilonLowReWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-    //- Destructor
-    virtual ~epsilonLowReWallFunctionFvPatchScalarField()
-    {}
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 2437271e2..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,586 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "epsilonWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "fvMatrix.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-scalar epsilonWallFunctionFvPatchScalarField::tolerance_ = 1e-5;
-
-// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
-
-void epsilonWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::setMaster()
-{
-    if (master_ != -1)
-    {
-        return;
-    }
-
-    const volScalarField& epsilon =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
-
-    label master = -1;
-    forAll(bf, patchI)
-    {
-        if (isA<epsilonWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            epsilonWallFunctionFvPatchScalarField& epf = epsilonPatch(patchI);
-
-            if (master == -1)
-            {
-                master = patchI;
-            }
-
-            epf.master() = master;
-        }
-    }
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::createAveragingWeights()
-{
-    const volScalarField& epsilon =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
-
-    const fvMesh& mesh = epsilon.mesh();
-
-    if (initialised_ && !mesh.changing())
-    {
-        return;
-    }
-
-    volScalarField weights
-    (
-        IOobject
-        (
-            "weights",
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false // do not register
-        ),
-        mesh,
-        dimensionedScalar("zero", dimless, 0.0)
-    );
-
-    DynamicList<label> epsilonPatches(bf.size());
-    forAll(bf, patchI)
-    {
-        if (isA<epsilonWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            epsilonPatches.append(patchI);
-
-            const labelUList& faceCells = bf[patchI].patch().faceCells();
-            forAll(faceCells, i)
-            {
-                label cellI = faceCells[i];
-                weights[cellI]++;
-            }
-        }
-    }
-
-    cornerWeights_.setSize(bf.size());
-    forAll(epsilonPatches, i)
-    {
-        label patchI = epsilonPatches[i];
-        const fvPatchScalarField& wf = weights.boundaryField()[patchI];
-        cornerWeights_[patchI] = 1.0/wf.patchInternalField();
-    }
-
-    G_.setSize(dimensionedInternalField().size(), 0.0);
-    epsilon_.setSize(dimensionedInternalField().size(), 0.0);
-
-    initialised_ = true;
-}
-
-
-epsilonWallFunctionFvPatchScalarField&
-epsilonWallFunctionFvPatchScalarField::epsilonPatch(const label patchI)
-{
-    const volScalarField& epsilon =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
-
-    const epsilonWallFunctionFvPatchScalarField& epf =
-        refCast<const epsilonWallFunctionFvPatchScalarField>(bf[patchI]);
-
-    return const_cast<epsilonWallFunctionFvPatchScalarField&>(epf);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::calculateTurbulenceFields
-(
-    const turbulenceModel& turbulence,
-    scalarField& G0,
-    scalarField& epsilon0
-)
-{
-    // accumulate all of the G and epsilon contributions
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            epsilonWallFunctionFvPatchScalarField& epf = epsilonPatch(patchI);
-
-            const List<scalar>& w = cornerWeights_[patchI];
-
-            epf.calculate(turbulence, w, epf.patch(), G0, epsilon0);
-        }
-    }
-
-    // apply zero-gradient condition for epsilon
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            epsilonWallFunctionFvPatchScalarField& epf = epsilonPatch(patchI);
-
-            epf == scalarField(epsilon0, epf.patch().faceCells());
-        }
-    }
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::calculate
-(
-    const turbulenceModel& turbulence,
-    const List<scalar>& cornerWeights,
-    const fvPatch& patch,
-    scalarField& G,
-    scalarField& epsilon
-)
-{
-    const label patchI = patch.index();
-
-    const scalarField& y = turbulence.y()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-    const scalar Cmu75 = pow(Cmu_, 0.75);
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tnu = turbulence.nu();
-    const scalarField& nuw = tnu().boundaryField()[patchI];
-
-    const tmp<volScalarField> tnut = turbulence.nut();
-    const volScalarField& nut = tnut();
-    const scalarField& nutw = nut.boundaryField()[patchI];
-
-    const fvPatchVectorField& Uw = turbulence.U().boundaryField()[patchI];
-
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    // Set epsilon and G
-    forAll(nutw, faceI)
-    {
-        label cellI = patch.faceCells()[faceI];
-
-        scalar w = cornerWeights[faceI];
-
-        epsilon[cellI] += w*Cmu75*pow(k[cellI], 1.5)/(kappa_*y[faceI]);
-
-        G[cellI] +=
-            w
-           *(nutw[faceI] + nuw[faceI])
-           *magGradUw[faceI]
-           *Cmu25*sqrt(k[cellI])
-           /(kappa_*y[faceI]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const epsilonWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-
-    // apply zero-gradient condition on start-up
-    this->operator==(patchInternalField());
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const epsilonWallFunctionFvPatchScalarField& ewfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(ewfpsf),
-    Cmu_(ewfpsf.Cmu_),
-    kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
-(
-    const epsilonWallFunctionFvPatchScalarField& ewfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(ewfpsf, iF),
-    Cmu_(ewfpsf.Cmu_),
-    kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_),
-    G_(),
-    epsilon_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-scalarField& epsilonWallFunctionFvPatchScalarField::G(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            G_ = 0.0;
-        }
-
-        return G_;
-    }
-
-    return epsilonPatch(master_).G();
-}
-
-
-scalarField& epsilonWallFunctionFvPatchScalarField::epsilon(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            epsilon_ = 0.0;
-        }
-
-        return epsilon_;
-    }
-
-    return epsilonPatch(master_).epsilon(init);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), epsilon(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& epsilon0 = this->epsilon();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& epsilon = const_cast<FieldType&>(dimensionedInternalField());
-
-    forAll(*this, faceI)
-    {
-        label cellI = patch().faceCells()[faceI];
-
-        G[cellI] = G0[cellI];
-        epsilon[cellI] = epsilon0[cellI];
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::updateCoeffs
-(
-    const scalarField& weights
-)
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), epsilon(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& epsilon0 = this->epsilon();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& epsilon = const_cast<FieldType&>(dimensionedInternalField());
-
-    scalarField& epsilonf = *this;
-
-    // only set the values if the weights are > tolerance
-    forAll(weights, faceI)
-    {
-        scalar w = weights[faceI];
-
-        if (w > tolerance_)
-        {
-            label cellI = patch().faceCells()[faceI];
-
-            G[cellI] = (1.0 - w)*G[cellI] + w*G0[cellI];
-            epsilon[cellI] = (1.0 - w)*epsilon[cellI] + w*epsilon0[cellI];
-            epsilonf[faceI] = epsilon[cellI];
-        }
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    matrix.setValues(patch().faceCells(), patchInternalField());
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix,
-    const Field<scalar>& weights
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    // filter weights so that we only apply the constraint where the
-    // weight > SMALL
-    DynamicList<label> constraintCells(weights.size());
-    DynamicList<scalar> constraintEpsilon(weights.size());
-    const labelUList& faceCells = patch().faceCells();
-
-    const DimensionedField<scalar, volMesh>& epsilon =
-        dimensionedInternalField();
-
-    label nConstrainedCells = 0;
-
-
-    forAll(weights, faceI)
-    {
-        // only set the values if the weights are > tolerance
-        if (weights[faceI] > tolerance_)
-        {
-            nConstrainedCells++;
-
-            label cellI = faceCells[faceI];
-
-            constraintCells.append(cellI);
-            constraintEpsilon.append(epsilon[cellI]);
-        }
-    }
-
-    if (debug)
-    {
-        Pout<< "Patch: " << patch().name()
-            << ": number of constrained cells = " << nConstrainedCells
-            << " out of " << patch().size()
-            << endl;
-    }
-
-    matrix.setValues
-    (
-        constraintCells,
-        scalarField(constraintEpsilon.xfer())
-    );
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    epsilonWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
deleted file mode 100644
index ef2eeeb83..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,291 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::incompressible::epsilonWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulence dissipation wall function
-    condition for high Reynolds number, turbulent flow cases.
-
-    The condition can be applied to wall boundaries, whereby it
-    - calculates \c epsilon and \c G
-    - inserts near wall epsilon values directly into the epsilon equation
-        to act as a constraint
-
-    where
-
-    \vartable
-        epsilon | turblence dissipation field
-        G       | turblence generation field
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            epsilonWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedInternalValueFvPatchField
-
-SourceFiles
-    epsilonWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef epsilonWallFunctionFvPatchScalarField_H
-#define epsilonWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-class turbulenceModel;
-
-/*---------------------------------------------------------------------------*\
-           Class epsilonWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class epsilonWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Tolerance used in weighted calculations
-        static scalar tolerance_;
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Local copy of turbulence G field
-        scalarField G_;
-
-        //- Local copy of turbulence epsilon field
-        scalarField epsilon_;
-
-        //- Initialised flag
-        bool initialised_;
-
-        //- Master patch ID
-        label master_;
-
-        //- List of averaging corner weights
-        List<List<scalar> > cornerWeights_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-        //- Set the master patch - master is responsible for updating all
-        //  wall function patches
-        virtual void setMaster();
-
-        //- Create the averaging weights for cells which are bounded by
-        //  multiple wall function faces
-        virtual void createAveragingWeights();
-
-        //- Helper function to return non-const access to an epsilon patch
-        virtual epsilonWallFunctionFvPatchScalarField& epsilonPatch
-        (
-            const label patchI
-        );
-
-        //- Main driver to calculate the turbulence fields
-        virtual void calculateTurbulenceFields
-        (
-            const turbulenceModel& turbulence,
-            scalarField& G0,
-            scalarField& epsilon0
-        );
-
-        //- Calculate the epsilon and G
-        virtual void calculate
-        (
-            const turbulenceModel& turbulence,
-            const List<scalar>& cornerWeights,
-            const fvPatch& patch,
-            scalarField& G,
-            scalarField& epsilon
-        );
-
-        //- Return non-const access to the master patch ID
-        virtual label& master()
-        {
-            return master_;
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("epsilonWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  epsilonWallFunctionFvPatchScalarField
-        //  onto a new patch
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const epsilonWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const epsilonWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        epsilonWallFunctionFvPatchScalarField
-        (
-            const epsilonWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-    //- Destructor
-    virtual ~epsilonWallFunctionFvPatchScalarField()
-    {}
-
-
-    // Member functions
-
-        // Access
-
-            //- Return non-const access to the master's G field
-            scalarField& G(bool init = false);
-
-            //- Return non-const access to the master's epsilon field
-            scalarField& epsilon(bool init = false);
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs(const scalarField& weights);
-
-            //- Manipulate matrix
-            virtual void manipulateMatrix(fvMatrix<scalar>& matrix);
-
-            //- Manipulate matrix with given weights
-            virtual void manipulateMatrix
-            (
-                fvMatrix<scalar>& matrix,
-                const scalarField& weights
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 437ea7623..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,252 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kLowReWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void kLowReWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("kLowReWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-scalar kLowReWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    Ceps2_(1.9),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const kLowReWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    Ceps2_(ptf.Ceps2_),
-    yPlusLam_(ptf.yPlusLam_)
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    Ceps2_(dict.lookupOrDefault<scalar>("Ceps2", 1.9)),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const kLowReWallFunctionFvPatchScalarField& kwfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(kwfpsf),
-    Cmu_(kwfpsf.Cmu_),
-    kappa_(kwfpsf.kappa_),
-    E_(kwfpsf.E_),
-    Ceps2_(kwfpsf.Ceps2_),
-    yPlusLam_(kwfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField
-(
-    const kLowReWallFunctionFvPatchScalarField& kwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(kwfpsf, iF),
-    Cmu_(kwfpsf.Cmu_),
-    kappa_(kwfpsf.kappa_),
-    E_(kwfpsf.E_),
-    Ceps2_(kwfpsf.Ceps2_),
-    yPlusLam_(kwfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void kLowReWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbulence.y()[patchI];
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tnu = turbulence.nu();
-    const scalarField& nuw = tnu().boundaryField()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    scalarField& kw = *this;
-
-    // Set k wall values
-    forAll(kw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uTau = Cmu25*sqrt(k[faceCellI]);
-
-        scalar yPlus = uTau*y[faceI]/nuw[faceI];
-
-        if (yPlus > yPlusLam_)
-        {
-            scalar Ck = -0.416;
-            scalar Bk = 8.366;
-            kw[faceI] = Ck/kappa_*log(yPlus) + Bk;
-        }
-        else
-        {
-            scalar C = 11.0;
-            scalar Cf = (1.0/sqr(yPlus + C) + 2.0*yPlus/pow3(C) - 1.0/sqr(C));
-            kw[faceI] = 2400.0/sqr(Ceps2_)*Cf;
-        }
-
-        kw[faceI] *= sqr(uTau);
-    }
-
-    fixedValueFvPatchField<scalar>::updateCoeffs();
-
-    // TODO: perform averaging for cells sharing more than one boundary face
-}
-
-
-void kLowReWallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes commsType
-)
-{
-    fixedValueFvPatchField<scalar>::evaluate(commsType);
-}
-
-
-void kLowReWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchField<scalar>::write(os);
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Ceps2") << Ceps2_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    kLowReWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H
deleted file mode 100644
index db99287ea..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,207 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 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/>.
-
-Class
-    Foam::incompressible::kLowReWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulence kinetic energy wall function
-    condition for low- and high-Reynolds number turbulent flow cases.
-
-    The model operates in two modes, based on the computed laminar-to-turbulent
-    switch-over y+ value derived from kappa and E.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-        Ceps2        | model coefficient       | no          | 1.9
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            kLowReWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedValueFvPatchField
-
-SourceFiles
-    kLowReWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kLowReWallFunctionFvPatchScalarField_H
-#define kLowReWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-            Class kLowReWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class kLowReWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Ceps2 coefficient
-        scalar Ceps2_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        scalar yPlusLam(const scalar kappa, const scalar E);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kLowReWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given kLowReWallFunctionFvPatchScalarField
-        //  onto a new patch
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const kLowReWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const kLowReWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new kLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        kLowReWallFunctionFvPatchScalarField
-        (
-            const kLowReWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new kLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Evaluate the patchField
-            virtual void evaluate(const Pstream::commsTypes);
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
deleted file mode 100644
index 9ff2371a6..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kqRWallFunctionFvPatchField.H"
-#include "fvPatchFieldMapper.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void kqRWallFunctionFvPatchField<Type>::checkType()
-{
-    if (!isA<wallFvPatch>(this->patch()))
-    {
-        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << this->patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << this->patch().type()
-            << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    zeroGradientFvPatchField<Type>(p, iF)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const kqRWallFunctionFvPatchField& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    zeroGradientFvPatchField<Type>(ptf, p, iF, mapper)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    zeroGradientFvPatchField<Type>(p, iF, dict)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const kqRWallFunctionFvPatchField& tkqrwfpf
-)
-:
-    zeroGradientFvPatchField<Type>(tkqrwfpf)
-{
-    checkType();
-}
-
-
-template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
-(
-    const kqRWallFunctionFvPatchField& tkqrwfpf,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    zeroGradientFvPatchField<Type>(tkqrwfpf, iF)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void kqRWallFunctionFvPatchField<Type>::evaluate
-(
-    const Pstream::commsTypes commsType
-)
-{
-    zeroGradientFvPatchField<Type>::evaluate(commsType);
-}
-
-
-template<class Type>
-void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
-{
-    zeroGradientFvPatchField<Type>::write(os);
-    this->writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
deleted file mode 100644
index e9b3731de..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ /dev/null
@@ -1,185 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::kqRWallFunctionFvPatchField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a suitable condition for turbulence
-    \c k, \c q, and \c R fields for the case of high Reynolds number flow using
-    wall functions.
-
-    It is a simple wrapper around the zero-gradient condition.
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            kqRWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::zeroGradientFvPatchField
-
-SourceFiles
-    kqRWallFunctionFvPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kqRWallFunctionFvPatchField_H
-#define kqRWallFunctionFvPatchField_H
-
-#include "zeroGradientFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-                Class kqRWallFunctionFvPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class kqRWallFunctionFvPatchField
-:
-    public zeroGradientFvPatchField<Type>
-{
-
-    // Private Member Functions
-
-        //- Check the type of the patch
-        void checkType();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kqRWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        kqRWallFunctionFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        kqRWallFunctionFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        // kqRWallFunctionFvPatchField
-        //  onto a new patch
-        kqRWallFunctionFvPatchField
-        (
-            const kqRWallFunctionFvPatchField&,
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        kqRWallFunctionFvPatchField
-        (
-            const kqRWallFunctionFvPatchField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new kqRWallFunctionFvPatchField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        kqRWallFunctionFvPatchField
-        (
-            const kqRWallFunctionFvPatchField&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
-        (
-            const DimensionedField<Type, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new kqRWallFunctionFvPatchField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Evaluate the patchField
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "kqRWallFunctionFvPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
deleted file mode 100644
index 9465bdf18..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kqRWallFunctionFvPatchFields.H"
-#include "fvPatchFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makePatchFields(kqRWallFunction);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
deleted file mode 100644
index b9a2727f3..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kqRWallFunctionFvPatchFields_H
-#define kqRWallFunctionFvPatchFields_H
-
-#include "kqRWallFunctionFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(kqRWallFunction);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
deleted file mode 100644
index a0e340bf4..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,131 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutLowReWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutLowReWallFunctionFvPatchScalarField::calcNut() const
-{
-    return tmp<scalarField>(new scalarField(patch().size(), 0.0));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
-(
-    const nutLowReWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
-(
-    const nutLowReWallFunctionFvPatchScalarField& nlrwfpsf
-)
-:
-    nutWallFunctionFvPatchScalarField(nlrwfpsf)
-{}
-
-
-nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
-(
-    const nutLowReWallFunctionFvPatchScalarField& nlrwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(nlrwfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> nutLowReWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-
-    return y*sqrt(nuw*mag(Uw.snGrad()))/nuw;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutLowReWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H
deleted file mode 100644
index f79533c20..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutLowReWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    for use with low Reynolds number models.  It sets \c nut to zero, and
-    provides an access function to calculate y+.
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutLowReWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutLowReWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutLowReWallFunctionFvPatchScalarField_H
-#define nutLowReWallFunctionFvPatchScalarField_H
-
-#include "nutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-           Class nutLowReWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutLowReWallFunctionFvPatchScalarField
-:
-    public nutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutLowReWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutLowReWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutLowReWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutLowReWallFunctionFvPatchScalarField
-        (
-            const nutLowReWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutLowReWallFunctionFvPatchScalarField
-        (
-            const nutLowReWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutLowReWallFunctionFvPatchScalarField
-        (
-            const nutLowReWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Calculate and return the yPlus at the boundary
-        virtual tmp<scalarField> yPlus() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
deleted file mode 100644
index fb992f1e9..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,313 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutURoughWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    // The flow velocity at the adjacent cell centre
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    tmp<scalarField> tyPlus = calcYPlus(magUp);
-    scalarField& yPlus = tyPlus();
-
-    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
-    scalarField& nutw = tnutw();
-
-    forAll(yPlus, facei)
-    {
-        if (yPlus[facei] > yPlusLam_)
-        {
-            const scalar Re = magUp[facei]*y[facei]/nuw[facei] + ROOTVSMALL;
-            nutw[facei] = nuw[facei]*(sqr(yPlus[facei])/Re - 1);
-        }
-    }
-
-    return tnutw;
-}
-
-
-tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcYPlus
-(
-    const scalarField& magUp
-) const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
-    scalarField& yPlus = tyPlus();
-
-    if (roughnessHeight_ > 0.0)
-    {
-        // Rough Walls
-        const scalar c_1 = 1/(90 - 2.25) + roughnessConstant_;
-        static const scalar c_2 = 2.25/(90 - 2.25);
-        static const scalar c_3 = 2.0*atan(1.0)/log(90/2.25);
-        static const scalar c_4 = c_3*log(2.25);
-
-        //if (KsPlusBasedOnYPlus_)
-        {
-            // If KsPlus is based on YPlus the extra term added to the law
-            // of the wall will depend on yPlus
-            forAll(yPlus, facei)
-            {
-                const scalar magUpara = magUp[facei];
-                const scalar Re = magUpara*y[facei]/nuw[facei];
-                const scalar kappaRe = kappa_*Re;
-
-                scalar yp = yPlusLam_;
-                const scalar ryPlusLam = 1.0/yp;
-
-                int iter = 0;
-                scalar yPlusLast = 0.0;
-                scalar dKsPlusdYPlus = roughnessHeight_/y[facei];
-
-                // Enforce the roughnessHeight to be less than the distance to
-                // the first cell centre
-                if (dKsPlusdYPlus > 1)
-                {
-                    dKsPlusdYPlus = 1;
-                }
-
-                // Additional tuning parameter - nominally = 1
-                dKsPlusdYPlus *= roughnessFactor_;
-
-                do
-                {
-                    yPlusLast = yp;
-
-                    // The non-dimensional roughness height
-                    scalar KsPlus = yp*dKsPlusdYPlus;
-
-                    // The extra term in the law-of-the-wall
-                    scalar G = 0.0;
-
-                    scalar yPlusGPrime = 0.0;
-
-                    if (KsPlus >= 90)
-                    {
-                        const scalar t_1 = 1 + roughnessConstant_*KsPlus;
-                        G = log(t_1);
-                        yPlusGPrime = roughnessConstant_*KsPlus/t_1;
-                    }
-                    else if (KsPlus > 2.25)
-                    {
-                        const scalar t_1 = c_1*KsPlus - c_2;
-                        const scalar t_2 = c_3*log(KsPlus) - c_4;
-                        const scalar sint_2 = sin(t_2);
-                        const scalar logt_1 = log(t_1);
-                        G = logt_1*sint_2;
-                        yPlusGPrime =
-                            (c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
-                    }
-
-                    scalar denom = 1.0 + log(E_*yp) - G - yPlusGPrime;
-                    if (mag(denom) > VSMALL)
-                    {
-                        yp = (kappaRe + yp*(1 - yPlusGPrime))/denom;
-                    }
-                } while
-                (
-                    mag(ryPlusLam*(yp - yPlusLast)) > 0.0001
-                 && ++iter < 10
-                 && yp > VSMALL
-                );
-
-                yPlus[facei] = max(0.0, yp);
-            }
-        }
-    }
-    else
-    {
-        // Smooth Walls
-        forAll(yPlus, facei)
-        {
-            const scalar magUpara = magUp[facei];
-            const scalar Re = magUpara*y[facei]/nuw[facei];
-            const scalar kappaRe = kappa_*Re;
-
-            scalar yp = yPlusLam_;
-            const scalar ryPlusLam = 1.0/yp;
-
-            int iter = 0;
-            scalar yPlusLast = 0.0;
-
-            do
-            {
-                yPlusLast = yp;
-                yp = (kappaRe + yp)/(1.0 + log(E_*yp));
-
-            } while (mag(ryPlusLam*(yp - yPlusLast)) > 0.0001 && ++iter < 10);
-
-            yPlus[facei] = max(0.0, yp);
-        }
-    }
-
-    return tyPlus;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF),
-    roughnessHeight_(pTraits<scalar>::zero),
-    roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFactor_(pTraits<scalar>::zero)
-{}
-
-
-nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
-(
-    const nutURoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    roughnessHeight_(ptf.roughnessHeight_),
-    roughnessConstant_(ptf.roughnessConstant_),
-    roughnessFactor_(ptf.roughnessFactor_)
-{}
-
-
-nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF, dict),
-    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
-    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFactor_(readScalar(dict.lookup("roughnessFactor")))
-{}
-
-
-nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
-(
-    const nutURoughWallFunctionFvPatchScalarField& rwfpsf
-)
-:
-    nutWallFunctionFvPatchScalarField(rwfpsf),
-    roughnessHeight_(rwfpsf.roughnessHeight_),
-    roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFactor_(rwfpsf.roughnessFactor_)
-{}
-
-
-nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
-(
-    const nutURoughWallFunctionFvPatchScalarField& rwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(rwfpsf, iF),
-    roughnessHeight_(rwfpsf.roughnessHeight_),
-    roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFactor_(rwfpsf.roughnessFactor_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    tmp<scalarField> magUp = mag(Uw.patchInternalField() - Uw);
-
-    return calcYPlus(magUp());
-}
-
-
-void nutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    os.writeKeyword("roughnessHeight")
-        << roughnessHeight_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessConstant")
-        << roughnessConstant_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessFactor")
-        << roughnessFactor_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutURoughWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 17adf6f90..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,241 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutURoughWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions for rough walls, based on velocity.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        roughnessHeight | roughness height     | yes         |
-        roughnessConstant | roughness constanr | yes         |
-        roughnessFactor | scaling factor       | yes         |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutURoughWallFunction;
-        roughnessHeight 1e-5;
-        roughnessConstant 0.5;
-        roughnessFactor 1;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutURoughWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutURoughWallFunctionFvPatchScalarField_H
-#define nutURoughWallFunctionFvPatchScalarField_H
-
-#include "nutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-          Class nutURoughWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutURoughWallFunctionFvPatchScalarField
-:
-    public nutWallFunctionFvPatchScalarField
-{
-    // Private data
-
-        // Roughness model parameters
-
-            //- Height
-            scalar roughnessHeight_;
-
-            //- Constant
-            scalar roughnessConstant_;
-
-            //- Scale factor
-            scalar roughnessFactor_;
-
-
-    // Protected Member Functions
-
-        //- Calculate yPLus
-        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutURoughWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutURoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutURoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutURoughWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutURoughWallFunctionFvPatchScalarField
-        (
-            const nutURoughWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutURoughWallFunctionFvPatchScalarField
-        (
-            const nutURoughWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutURoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutURoughWallFunctionFvPatchScalarField
-        (
-            const nutURoughWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutURoughWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Access
-
-            //- Return the roughness height
-            scalar roughnessHeight() const
-            {
-                return roughnessHeight_;
-            }
-
-            //- Return reference to the roughness height to allow adjustment
-            scalar& roughnessHeight()
-            {
-                return roughnessHeight_;
-            }
-
-
-            //- Return the roughness constant scale
-            scalar roughnessConstant() const
-            {
-                return roughnessConstant_;
-            }
-
-            //- Return reference to the roughness constant to allow adjustment
-            scalar& roughnessConstant()
-            {
-                return roughnessConstant_;
-            }
-
-            //- Return the roughness scale factor
-            scalar roughnessFactor() const
-            {
-                return roughnessFactor_;
-            }
-
-            //- Return reference to the roughness scale factor to allow
-            //  adjustment
-            scalar& roughnessFactor()
-            {
-                return roughnessFactor_;
-            }
-
-
-    // I-O
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 7dca54b3e..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,220 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutUSpaldingWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchI];
-    const scalarField magGradU(mag(Uw.snGrad()));
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchI];
-
-    return max
-    (
-        scalar(0),
-        sqr(calcUTau(magGradU))/(magGradU + ROOTVSMALL) - nuw
-    );
-}
-
-
-tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcUTau
-(
-    const scalarField& magGradU
-) const
-{
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchI];
-
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchI];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchI];
-
-    const scalarField& nutw = *this;
-
-    tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
-    scalarField& uTau = tuTau();
-
-    forAll(uTau, faceI)
-    {
-        scalar ut = sqrt((nutw[faceI] + nuw[faceI])*magGradU[faceI]);
-
-        if (ut > ROOTVSMALL)
-        {
-            int iter = 0;
-            scalar err = GREAT;
-
-            do
-            {
-                scalar kUu = min(kappa_*magUp[faceI]/ut, 50);
-                scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
-
-                scalar f =
-                    - ut*y[faceI]/nuw[faceI]
-                    + magUp[faceI]/ut
-                    + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
-
-                scalar df =
-                    y[faceI]/nuw[faceI]
-                  + magUp[faceI]/sqr(ut)
-                  + 1/E_*kUu*fkUu/ut;
-
-                scalar uTauNew = ut + f/df;
-                err = mag((ut - uTauNew)/ut);
-                ut = uTauNew;
-
-            } while (ut > ROOTVSMALL && err > 0.01 && ++iter < 10);
-
-            uTau[faceI] = max(0.0, ut);
-        }
-    }
-
-    return tuTau;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutUSpaldingWallFunctionFvPatchScalarField::
-nutUSpaldingWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-nutUSpaldingWallFunctionFvPatchScalarField::
-nutUSpaldingWallFunctionFvPatchScalarField
-(
-    const nutUSpaldingWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-nutUSpaldingWallFunctionFvPatchScalarField::
-nutUSpaldingWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-nutUSpaldingWallFunctionFvPatchScalarField::
-nutUSpaldingWallFunctionFvPatchScalarField
-(
-    const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    nutWallFunctionFvPatchScalarField(wfpsf)
-{}
-
-
-nutUSpaldingWallFunctionFvPatchScalarField::
-nutUSpaldingWallFunctionFvPatchScalarField
-(
-    const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(wfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    return y*calcUTau(mag(Uw.snGrad()))/nuw;
-}
-
-
-void nutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutUSpaldingWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 210de4583..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,190 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutUSpaldingWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions for rough walls, based on velocity,  using
-    Spalding's law to give a continuous nut profile to the wall (y+ = 0)
-
-        \f[
-            y^+ = u^+ + \frac{1}{E} \left[exp(\kappa u^+) - 1 - \kappa u^+\,
-                - 0.5 (\kappa u^+)^2 - \frac{1}{6} (\kappa u^+)^3\right]
-        \f]
-
-    where
-    \vartable
-        y^+     | non-dimensional position
-        u^+     | non-dimensional velocity
-        \kappa  | Von Karman constant
-    \endvartable
-
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutUSpaldingWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutUSpaldingWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutUSpaldingWallFunctionFvPatchScalarField_H
-#define nutUSpaldingWallFunctionFvPatchScalarField_H
-
-#include "nutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-          Class nutUSpaldingWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutUSpaldingWallFunctionFvPatchScalarField
-:
-    public nutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-        //- Calculate the friction velocity
-        virtual tmp<scalarField> calcUTau(const scalarField& magGradU) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutUSpaldingWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutUSpaldingWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const nutUSpaldingWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const nutUSpaldingWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUSpaldingWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutUSpaldingWallFunctionFvPatchScalarField
-        (
-            const nutUSpaldingWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUSpaldingWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 63bab8147..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,218 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutUTabulatedWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-    const scalarField magGradU(mag(Uw.snGrad()));
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    return
-        max
-        (
-            scalar(0),
-            sqr(magUp/(calcUPlus(magUp*y/nuw) + ROOTVSMALL))
-           /(magGradU + ROOTVSMALL)
-          - nuw
-        );
-}
-
-
-tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::calcUPlus
-(
-    const scalarField& Rey
-) const
-{
-    tmp<scalarField> tuPlus(new scalarField(patch().size(), 0.0));
-    scalarField& uPlus = tuPlus();
-
-    forAll(uPlus, faceI)
-    {
-        uPlus[faceI] = uPlusTable_.interpolateLog10(Rey[faceI]);
-    }
-
-    return tuPlus;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutUTabulatedWallFunctionFvPatchScalarField::
-nutUTabulatedWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF),
-    uPlusTableName_("undefined-uPlusTableName"),
-    uPlusTable_
-    (
-        IOobject
-        (
-            uPlusTableName_,
-            patch().boundaryMesh().mesh().time().constant(),
-            patch().boundaryMesh().mesh(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        false
-    )
-{}
-
-
-nutUTabulatedWallFunctionFvPatchScalarField::
-nutUTabulatedWallFunctionFvPatchScalarField
-(
-    const nutUTabulatedWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    uPlusTableName_(ptf.uPlusTableName_),
-    uPlusTable_(ptf.uPlusTable_)
-{}
-
-
-nutUTabulatedWallFunctionFvPatchScalarField::
-nutUTabulatedWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF, dict),
-    uPlusTableName_(dict.lookup("uPlusTable")),
-    uPlusTable_
-    (
-        IOobject
-        (
-            uPlusTableName_,
-            patch().boundaryMesh().mesh().time().constant(),
-            patch().boundaryMesh().mesh(),
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE,
-            false
-        ),
-        true
-    )
-{}
-
-
-nutUTabulatedWallFunctionFvPatchScalarField::
-nutUTabulatedWallFunctionFvPatchScalarField
-(
-    const nutUTabulatedWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    nutWallFunctionFvPatchScalarField(wfpsf),
-    uPlusTableName_(wfpsf.uPlusTableName_),
-    uPlusTable_(wfpsf.uPlusTable_)
-{}
-
-
-nutUTabulatedWallFunctionFvPatchScalarField::
-nutUTabulatedWallFunctionFvPatchScalarField
-(
-    const nutUTabulatedWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(wfpsf, iF),
-    uPlusTableName_(wfpsf.uPlusTableName_),
-    uPlusTable_(wfpsf.uPlusTable_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-    const scalarField Rey(magUp*y/nuw);
-
-    return Rey/(calcUPlus(Rey) + ROOTVSMALL);
-}
-
-
-void nutUTabulatedWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    os.writeKeyword("uPlusTable") << uPlusTableName_
-        << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutUTabulatedWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
deleted file mode 100644
index f4f3d9a8f..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,198 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::incompressible::nutUTabulatedWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions.  As input, the user specifies a look-up table
-    of U+ as a function of near-wall Reynolds number.  The table should be
-    located in the $FOAM_CASE/constant directory.
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        uPlusTable   | U+ as a function of Re table name | yes |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutTabulatedWallFunction;
-        uPlusTable      myUPlusTable;
-    }
-    \endverbatim
-
-Note
-    The tables are not registered since the same table object may be used for
-    more than one patch.
-
-SeeAlso
-    Foam::nutWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutUTabulatedWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutUTabulatedWallFunctionFvPatchScalarField_H
-#define nutUTabulatedWallFunctionFvPatchScalarField_H
-
-#include "nutWallFunctionFvPatchScalarField.H"
-#include "uniformInterpolationTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-        Class nutUTabulatedWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutUTabulatedWallFunctionFvPatchScalarField
-:
-    public nutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        //- Name of u+ table
-        word uPlusTableName_;
-
-        //- U+ table
-        uniformInterpolationTable<scalar> uPlusTable_;
-
-
-    // Protected Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-        //- Calculate wall u+ from table
-        virtual tmp<scalarField> calcUPlus(const scalarField& Rey) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutTabulatedWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutUTabulatedWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutUTabulatedWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutUTabulatedWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutUTabulatedWallFunctionFvPatchScalarField
-        (
-            const nutUTabulatedWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutUTabulatedWallFunctionFvPatchScalarField
-        (
-            const nutUTabulatedWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUTabulatedWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutUTabulatedWallFunctionFvPatchScalarField
-        (
-            const nutUTabulatedWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUTabulatedWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 3b34b46df..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,202 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutUWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    tmp<scalarField> tyPlus = calcYPlus(magUp);
-    scalarField& yPlus = tyPlus();
-
-    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
-    scalarField& nutw = tnutw();
-
-    forAll(yPlus, facei)
-    {
-        if (yPlus[facei] > yPlusLam_)
-        {
-            nutw[facei] =
-                nuw[facei]*(yPlus[facei]*kappa_/log(E_*yPlus[facei]) - 1.0);
-        }
-    }
-
-    return tnutw;
-}
-
-
-tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcYPlus
-(
-    const scalarField& magUp
-) const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
-    scalarField& yPlus = tyPlus();
-
-    forAll(yPlus, facei)
-    {
-        scalar kappaRe = kappa_*magUp[facei]*y[facei]/nuw[facei];
-
-        scalar yp = yPlusLam_;
-        scalar ryPlusLam = 1.0/yp;
-
-        int iter = 0;
-        scalar yPlusLast = 0.0;
-
-        do
-        {
-            yPlusLast = yp;
-            yp = (kappaRe + yp)/(1.0 + log(E_*yp));
-
-        } while (mag(ryPlusLam*(yp - yPlusLast)) > 0.01 && ++iter < 10 );
-
-        yPlus[facei] = max(0.0, yp);
-    }
-
-    return tyPlus;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
-(
-    const nutUWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
-(
-    const nutUWallFunctionFvPatchScalarField& sawfpsf
-)
-:
-    nutWallFunctionFvPatchScalarField(sawfpsf)
-{}
-
-
-nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
-(
-    const nutUWallFunctionFvPatchScalarField& sawfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(sawfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> nutUWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-
-    return calcYPlus(magUp);
-}
-
-
-void nutUWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutUWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 0a34ad6fa..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutUWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions, based on velocity.
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutUWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutUWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutUWallFunctionFvPatchScalarField_H
-#define nutUWallFunctionFvPatchScalarField_H
-
-#include "nutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-            Class nutUWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutUWallFunctionFvPatchScalarField
-:
-    public nutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate yPLus
-        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutUWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutUWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutUWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutUWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutUWallFunctionFvPatchScalarField
-        (
-            const nutUWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutUWallFunctionFvPatchScalarField
-        (
-            const nutUWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutUWallFunctionFvPatchScalarField
-        (
-            const nutUWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Evaluation functions
-
-            //- Calculate and return the yPlus at the boundary
-            virtual tmp<scalarField> yPlus() const;
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream& os) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 3b8749974..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------* \
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutWallFunctionFvPatchScalarField.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(nutWallFunctionFvPatchScalarField, 0);
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void nutWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const nutWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    yPlusLam_(ptf.yPlusLam_)
-{
-    checkType();
-}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    yPlusLam_(yPlusLam(kappa_, E_))
-{
-    checkType();
-}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const nutWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    fixedValueFvPatchScalarField(wfpsf),
-    Cmu_(wfpsf.Cmu_),
-    kappa_(wfpsf.kappa_),
-    E_(wfpsf.E_),
-    yPlusLam_(wfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const nutWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(wfpsf, iF),
-    Cmu_(wfpsf.Cmu_),
-    kappa_(wfpsf.kappa_),
-    E_(wfpsf.E_),
-    yPlusLam_(wfpsf.yPlusLam_)
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-scalar nutWallFunctionFvPatchScalarField::yPlusLam
-(
-    const scalar kappa,
-    const scalar E
-)
-{
-    scalar ypl = 11.0;
-
-    for (int i=0; i<10; i++)
-    {
-        ypl = log(max(E*ypl, 1))/kappa;
-    }
-
-    return ypl;
-}
-
-
-void nutWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    operator==(calcNut());
-
-    fixedValueFvPatchScalarField::updateCoeffs();
-}
-
-
-void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
deleted file mode 100644
index de68000bd..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,181 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions, based on turbulence kinetic energy.
-    - replicates OpenFOAM v1.5 (and earlier) behaviour
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::fixedValueFvPatchField
-
-SourceFiles
-    nutWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutWallFunctionFvPatchScalarField_H
-#define nutWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-             Class nutWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const = 0;
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutWallFunctionFvPatchScalarField
-        (
-            const nutWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutWallFunctionFvPatchScalarField
-        (
-            const nutWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct as copy setting internal field reference
-        nutWallFunctionFvPatchScalarField
-        (
-            const nutWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-
-    // Member functions
-
-        //- Calculate the Y+ at the edge of the laminar sublayer
-        static scalar yPlusLam(const scalar kappa, const scalar E);
-
-        //- Calculate and return the yPlus at the boundary
-        virtual tmp<scalarField> yPlus() const = 0;
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 9e724596b..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutkAtmRoughWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutkAtmRoughWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchI = patch().index();
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbulence.y()[patchI];
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-    const tmp<volScalarField> tnu = turbulence.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    tmp<scalarField> tnutw(new scalarField(*this));
-    scalarField& nutw = tnutw();
-
-    forAll(nutw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uStar = Cmu25*sqrt(k[faceCellI]);
-        scalar yPlus = uStar*y[faceI]/nuw[faceI];
-
-        scalar Edash = (y[faceI] + z0_[faceI])/(z0_[faceI] + 1e-4);
-
-        nutw[faceI] =
-            nuw[faceI]*(yPlus*kappa_/log(max(Edash, 1 + 1e-4)) - 1);
-
-        if (debug)
-        {
-            Info<< "yPlus = " << yPlus
-                << ", Edash = " << Edash
-                << ", nutw = " << nutw[faceI]
-                << endl;
-        }
-    }
-
-    return tnutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutkAtmRoughWallFunctionFvPatchScalarField::
-nutkAtmRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutkWallFunctionFvPatchScalarField(p, iF),
-    z0_(p.size(), 0.0)
-{}
-
-
-nutkAtmRoughWallFunctionFvPatchScalarField::
-nutkAtmRoughWallFunctionFvPatchScalarField
-(
-    const nutkAtmRoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    z0_(ptf.z0_, mapper)
-{}
-
-
-nutkAtmRoughWallFunctionFvPatchScalarField::
-nutkAtmRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutkWallFunctionFvPatchScalarField(p, iF, dict),
-    z0_("z0", dict, p.size())
-{}
-
-
-nutkAtmRoughWallFunctionFvPatchScalarField::
-nutkAtmRoughWallFunctionFvPatchScalarField
-(
-    const nutkAtmRoughWallFunctionFvPatchScalarField& rwfpsf
-)
-:
-    nutkWallFunctionFvPatchScalarField(rwfpsf),
-    z0_(rwfpsf.z0_)
-{}
-
-
-nutkAtmRoughWallFunctionFvPatchScalarField::
-nutkAtmRoughWallFunctionFvPatchScalarField
-(
-    const nutkAtmRoughWallFunctionFvPatchScalarField& rwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutkWallFunctionFvPatchScalarField(rwfpsf, iF),
-    z0_(rwfpsf.z0_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void nutkAtmRoughWallFunctionFvPatchScalarField::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    nutkWallFunctionFvPatchScalarField::autoMap(m);
-    z0_.autoMap(m);
-}
-
-
-void nutkAtmRoughWallFunctionFvPatchScalarField::rmap
-(
-    const fvPatchScalarField& ptf,
-    const labelList& addr
-)
-{
-    nutkWallFunctionFvPatchScalarField::rmap(ptf, addr);
-
-    const nutkAtmRoughWallFunctionFvPatchScalarField& nrwfpsf =
-        refCast<const nutkAtmRoughWallFunctionFvPatchScalarField>(ptf);
-
-    z0_.rmap(nrwfpsf.z0_, addr);
-}
-
-
-void nutkAtmRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    z0_.writeEntry("z0", os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutkAtmRoughWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 3767de1fc..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,217 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutkAtmRoughWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity for
-    atmospheric velocity profiles.  It is desinged to be used in conjunction
-    with the atmBoundaryLayerInletVelocity boundary condition.  The values
-    are calculated using:
-
-        \f[
-            U = frac{U_f}{K} ln(\frac{z + z_0}{z_0})
-        \f]
-
-    where
-
-    \vartable
-        U_f | frictional velocity
-        K   | Von Karman's constant
-        z_0 | surface roughness length
-        z   | vertical co-ordinate
-    \endvartable
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        z0           | surface roughness length| yes         |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutkAtmRoughWallFunction;
-        z0              uniform 0;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutkWallFunctionFvPatchField
-
-SourceFiles
-    nutkAtmRoughWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutkAtmRoughWallFunctionFvPatchScalarField_H
-#define nutkAtmRoughWallFunctionFvPatchScalarField_H
-
-#include "nutkWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-          Class nutkAtmRoughWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutkAtmRoughWallFunctionFvPatchScalarField
-:
-    public nutkWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        //- Surface roughness length
-        scalarField z0_;
-
-
-    // Protected Member Functions
-
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutkAtmRoughWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutkAtmRoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutkAtmRoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutkAtmRoughWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutkAtmRoughWallFunctionFvPatchScalarField
-        (
-            const nutkAtmRoughWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutkAtmRoughWallFunctionFvPatchScalarField
-        (
-            const nutkAtmRoughWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkAtmRoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutkAtmRoughWallFunctionFvPatchScalarField
-        (
-            const nutkAtmRoughWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkAtmRoughWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Acces functions
-
-            // Return z0
-            scalarField& z0()
-            {
-                return z0_;
-            }
-
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap(const fvPatchFieldMapper&);
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchScalarField&,
-                const labelList&
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 61d806882..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,241 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutkRoughWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-scalar nutkRoughWallFunctionFvPatchScalarField::fnRough
-(
-    const scalar KsPlus,
-    const scalar Cs
-) const
-{
-    // Return fn based on non-dimensional roughness height
-
-    if (KsPlus < 90.0)
-    {
-        return pow
-        (
-            (KsPlus - 2.25)/87.75 + Cs*KsPlus,
-            sin(0.4258*(log(KsPlus) - 0.811))
-        );
-    }
-    else
-    {
-        return (1.0 + Cs*KsPlus);
-    }
-}
-
-
-tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    tmp<scalarField> tnutw(new scalarField(*this));
-    scalarField& nutw = tnutw();
-
-    forAll(nutw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar uStar = Cmu25*sqrt(k[faceCellI]);
-        scalar yPlus = uStar*y[faceI]/nuw[faceI];
-        scalar KsPlus = uStar*Ks_[faceI]/nuw[faceI];
-
-        scalar Edash = E_;
-        if (KsPlus > 2.25)
-        {
-            Edash /= fnRough(KsPlus, Cs_[faceI]);
-        }
-
-        scalar limitingNutw = max(nutw[faceI], nuw[faceI]);
-
-        // To avoid oscillations limit the change in the wall viscosity
-        // which is particularly important if it temporarily becomes zero
-        nutw[faceI] =
-            max
-            (
-                min
-                (
-                    nuw[faceI]
-                   *(yPlus*kappa_/log(max(Edash*yPlus, 1+1e-4)) - 1),
-                    2*limitingNutw
-                ), 0.5*limitingNutw
-            );
-
-        if (debug)
-        {
-            Info<< "yPlus = " << yPlus
-                << ", KsPlus = " << KsPlus
-                << ", Edash = " << Edash
-                << ", nutw = " << nutw[faceI]
-                << endl;
-        }
-    }
-
-    return tnutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutkWallFunctionFvPatchScalarField(p, iF),
-    Ks_(p.size(), 0.0),
-    Cs_(p.size(), 0.0)
-{}
-
-
-nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
-(
-    const nutkRoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    Ks_(ptf.Ks_, mapper),
-    Cs_(ptf.Cs_, mapper)
-{}
-
-
-nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutkWallFunctionFvPatchScalarField(p, iF, dict),
-    Ks_("Ks", dict, p.size()),
-    Cs_("Cs", dict, p.size())
-{}
-
-
-nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
-(
-    const nutkRoughWallFunctionFvPatchScalarField& rwfpsf
-)
-:
-    nutkWallFunctionFvPatchScalarField(rwfpsf),
-    Ks_(rwfpsf.Ks_),
-    Cs_(rwfpsf.Cs_)
-{}
-
-
-nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
-(
-    const nutkRoughWallFunctionFvPatchScalarField& rwfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutkWallFunctionFvPatchScalarField(rwfpsf, iF),
-    Ks_(rwfpsf.Ks_),
-    Cs_(rwfpsf.Cs_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void nutkRoughWallFunctionFvPatchScalarField::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    nutkWallFunctionFvPatchScalarField::autoMap(m);
-    Ks_.autoMap(m);
-    Cs_.autoMap(m);
-}
-
-
-void nutkRoughWallFunctionFvPatchScalarField::rmap
-(
-    const fvPatchScalarField& ptf,
-    const labelList& addr
-)
-{
-    nutkWallFunctionFvPatchScalarField::rmap(ptf, addr);
-
-    const nutkRoughWallFunctionFvPatchScalarField& nrwfpsf =
-        refCast<const nutkRoughWallFunctionFvPatchScalarField>(ptf);
-
-    Ks_.rmap(nrwfpsf.Ks_, addr);
-    Cs_.rmap(nrwfpsf.Cs_, addr);
-}
-
-
-void nutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-    Cs_.writeEntry("Cs", os);
-    Ks_.writeEntry("Ks", os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutkRoughWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 5f5e495fd..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,221 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-Class
-    Foam::incompressible::nutkRoughWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions for rough walls, based on turbulence kinetic
-    energy.  The condition manipulates the E parameter to account for roughness
-    effects.
-
-    Parameter ranges
-    - roughness height = sand-grain roughness (0 for smooth walls)
-    - roughness constant = 0.5-1.0
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Ks           | sand-grain roughness height | yes     |
-        Cs           | roughness constant      | yes         |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutkRoughWallFunction;
-        Ks              uniform 0;
-        Cs              uniform 0.5;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutkRoughWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutkRoughWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutkRoughWallFunctionFvPatchScalarField_H
-#define nutkRoughWallFunctionFvPatchScalarField_H
-
-#include "nutkWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-           Class nutkRoughWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutkRoughWallFunctionFvPatchScalarField
-:
-    public nutkWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected data
-
-        //- Roughness height
-        scalarField Ks_;
-
-        //- Roughness constant
-        scalarField Cs_;
-
-
-    // Protected Member Functions
-
-        //- Compute the roughness function
-        virtual scalar fnRough(const scalar KsPlus, const scalar Cs) const;
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutkRoughWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutkRoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutkRoughWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutkRoughWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutkRoughWallFunctionFvPatchScalarField
-        (
-            const nutkRoughWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutkRoughWallFunctionFvPatchScalarField
-        (
-            const nutkRoughWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkRoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutkRoughWallFunctionFvPatchScalarField
-        (
-            const nutkRoughWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkRoughWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Acces functions
-
-            // Return Ks
-            scalarField& Ks()
-            {
-                return Ks_;
-            }
-
-            // Return Cs
-            scalarField& Cs()
-            {
-                return Cs_;
-            }
-
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap(const fvPatchFieldMapper&);
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchScalarField&,
-                const labelList&
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
deleted file mode 100644
index bfc542434..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------------* \
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutkWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
-    scalarField& nutw = tnutw();
-
-    forAll(nutw, faceI)
-    {
-        label faceCellI = patch().faceCells()[faceI];
-
-        scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
-
-        if (yPlus > yPlusLam_)
-        {
-            nutw[faceI] = nuw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1.0);
-        }
-    }
-
-    return tnutw;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF)
-{}
-
-
-nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
-(
-    const nutkWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    nutWallFunctionFvPatchScalarField(p, iF, dict)
-{}
-
-
-nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
-(
-    const nutkWallFunctionFvPatchScalarField& wfpsf
-)
-:
-    nutWallFunctionFvPatchScalarField(wfpsf)
-{}
-
-
-nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
-(
-    const nutkWallFunctionFvPatchScalarField& wfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    nutWallFunctionFvPatchScalarField(wfpsf, iF)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const
-{
-    const label patchi = patch().index();
-
-    const turbulenceModel& turbModel =
-        db().lookupObject<turbulenceModel>("turbulenceModel");
-    const scalarField& y = turbModel.y()[patchi];
-
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    tmp<scalarField> kwc = k.boundaryField()[patchi].patchInternalField();
-    const tmp<volScalarField> tnu = turbModel.nu();
-    const volScalarField& nu = tnu();
-    const scalarField& nuw = nu.boundaryField()[patchi];
-
-    return pow025(Cmu_)*y*sqrt(kwc)/nuw;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutkWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
deleted file mode 100644
index ef0a3066d..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,166 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 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/>.
-
-Class
-    Foam::incompressible::nutkWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a turbulent kinematic viscosity condition
-    when using wall functions, based on turbulence kinetic energy.
-    - replicates OpenFOAM v1.5 (and earlier) behaviour
-
-    \heading Patch usage
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            nutkWallFunction;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::nutWallFunctionFvPatchScalarField
-
-SourceFiles
-    nutkWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef nutkWallFunctionFvPatchScalarField_H
-#define nutkWallFunctionFvPatchScalarField_H
-
-#include "nutWallFunctionFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-             Class nutkWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class nutkWallFunctionFvPatchScalarField
-:
-    public nutWallFunctionFvPatchScalarField
-{
-protected:
-
-    // Protected Member Functions
-
-        //- Calculate the turbulence viscosity
-        virtual tmp<scalarField> calcNut() const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("nutkWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        nutkWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        nutkWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  nutkWallFunctionFvPatchScalarField
-        //  onto a new patch
-        nutkWallFunctionFvPatchScalarField
-        (
-            const nutkWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        nutkWallFunctionFvPatchScalarField
-        (
-            const nutkWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        nutkWallFunctionFvPatchScalarField
-        (
-            const nutkWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        //- Calculate and return the yPlus at the boundary
-        virtual tmp<scalarField> yPlus() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
deleted file mode 100644
index ebc195ece..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,601 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "omegaWallFunctionFvPatchScalarField.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-#include "fvPatchFieldMapper.H"
-#include "fvMatrix.H"
-#include "volFields.H"
-#include "wallFvPatch.H"
-#include "nutkWallFunctionFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-scalar omegaWallFunctionFvPatchScalarField::tolerance_ = 1e-5;
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void omegaWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
-            << "Invalid wall function specification" << nl
-            << "    Patch type for patch " << patch().name()
-            << " must be wall" << nl
-            << "    Current patch type is " << patch().type() << nl << endl
-            << abort(FatalError);
-    }
-}
-
-
-void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
-{
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
-    os.writeKeyword("beta1") << beta1_ << token::END_STATEMENT << nl;
-}
-
-
-void omegaWallFunctionFvPatchScalarField::setMaster()
-{
-    if (master_ != -1)
-    {
-        return;
-    }
-
-    const volScalarField& omega =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
-
-    label master = -1;
-    forAll(bf, patchI)
-    {
-        if (isA<omegaWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            omegaWallFunctionFvPatchScalarField& opf = omegaPatch(patchI);
-
-            if (master == -1)
-            {
-                master = patchI;
-            }
-
-            opf.master() = master;
-        }
-    }
-}
-
-
-void omegaWallFunctionFvPatchScalarField::createAveragingWeights()
-{
-    const volScalarField& omega =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
-
-    const fvMesh& mesh = omega.mesh();
-
-    if (initialised_ && !mesh.changing())
-    {
-        return;
-    }
-
-    volScalarField weights
-    (
-        IOobject
-        (
-            "weights",
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false // do not register
-        ),
-        mesh,
-        dimensionedScalar("zero", dimless, 0.0)
-    );
-
-    DynamicList<label> omegaPatches(bf.size());
-    forAll(bf, patchI)
-    {
-        if (isA<omegaWallFunctionFvPatchScalarField>(bf[patchI]))
-        {
-            omegaPatches.append(patchI);
-
-            const labelUList& faceCells = bf[patchI].patch().faceCells();
-            forAll(faceCells, i)
-            {
-                label cellI = faceCells[i];
-                weights[cellI]++;
-            }
-        }
-    }
-
-    cornerWeights_.setSize(bf.size());
-    forAll(omegaPatches, i)
-    {
-        label patchI = omegaPatches[i];
-        const fvPatchScalarField& wf = weights.boundaryField()[patchI];
-        cornerWeights_[patchI] = 1.0/wf.patchInternalField();
-    }
-
-    G_.setSize(dimensionedInternalField().size(), 0.0);
-    omega_.setSize(dimensionedInternalField().size(), 0.0);
-
-    initialised_ = true;
-}
-
-
-omegaWallFunctionFvPatchScalarField&
-omegaWallFunctionFvPatchScalarField::omegaPatch(const label patchI)
-{
-    const volScalarField& omega =
-        static_cast<const volScalarField&>(this->dimensionedInternalField());
-
-    const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
-
-    const omegaWallFunctionFvPatchScalarField& opf =
-        refCast<const omegaWallFunctionFvPatchScalarField>(bf[patchI]);
-
-    return const_cast<omegaWallFunctionFvPatchScalarField&>(opf);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::calculateTurbulenceFields
-(
-    const turbulenceModel& turbulence,
-    scalarField& G0,
-    scalarField& omega0
-)
-{
-    // accumulate all of the G and omega contributions
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            omegaWallFunctionFvPatchScalarField& opf = omegaPatch(patchI);
-
-            const List<scalar>& w = cornerWeights_[patchI];
-
-            opf.calculate(turbulence, w, opf.patch(), G0, omega0);
-        }
-    }
-
-    // apply zero-gradient condition for omega
-    forAll(cornerWeights_, patchI)
-    {
-        if (!cornerWeights_[patchI].empty())
-        {
-            omegaWallFunctionFvPatchScalarField& opf = omegaPatch(patchI);
-
-            opf == scalarField(omega0, opf.patch().faceCells());
-        }
-    }
-}
-
-
-void omegaWallFunctionFvPatchScalarField::calculate
-(
-    const turbulenceModel& turbulence,
-    const List<scalar>& cornerWeights,
-    const fvPatch& patch,
-    scalarField& G,
-    scalarField& omega
-)
-{
-    const label patchI = patch.index();
-
-    const scalarField& y = turbulence.y()[patchI];
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    const tmp<volScalarField> tk = turbulence.k();
-    const volScalarField& k = tk();
-
-    const tmp<volScalarField> tnu = turbulence.nu();
-    const scalarField& nuw = tnu().boundaryField()[patchI];
-
-    const tmp<volScalarField> tnut = turbulence.nut();
-    const volScalarField& nut = tnut();
-    const scalarField& nutw = nut.boundaryField()[patchI];
-
-    const fvPatchVectorField& Uw = turbulence.U().boundaryField()[patchI];
-
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    // Set omega and G
-    forAll(nutw, faceI)
-    {
-        label cellI = patch.faceCells()[faceI];
-
-        scalar w = cornerWeights[faceI];
-
-        scalar omegaVis = 6.0*nuw[faceI]/(beta1_*sqr(y[faceI]));
-
-        scalar omegaLog = sqrt(k[cellI])/(Cmu25*kappa_*y[faceI]);
-
-        omega[cellI] += w*sqrt(sqr(omegaVis) + sqr(omegaLog));
-
-        G[cellI] +=
-            w
-           *(nutw[faceI] + nuw[faceI])
-           *magGradUw[faceI]
-           *Cmu25*sqrt(k[cellI])
-           /(kappa_*y[faceI]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    beta1_(0.075),
-    yPlusLam_(nutkWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const omegaWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    beta1_(ptf.beta1_),
-    yPlusLam_(ptf.yPlusLam_),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    beta1_(dict.lookupOrDefault<scalar>("beta1", 0.075)),
-    yPlusLam_(nutkWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-
-    // apply zero-gradient condition on start-up
-    this->operator==(patchInternalField());
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const omegaWallFunctionFvPatchScalarField& owfpsf
-)
-:
-    fixedValueFvPatchField<scalar>(owfpsf),
-    Cmu_(owfpsf.Cmu_),
-    kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_),
-    beta1_(owfpsf.beta1_),
-    yPlusLam_(owfpsf.yPlusLam_),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
-(
-    const omegaWallFunctionFvPatchScalarField& owfpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchField<scalar>(owfpsf, iF),
-    Cmu_(owfpsf.Cmu_),
-    kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_),
-    beta1_(owfpsf.beta1_),
-    yPlusLam_(owfpsf.yPlusLam_),
-    G_(),
-    omega_(),
-    initialised_(false),
-    master_(-1),
-    cornerWeights_()
-{
-    checkType();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-scalarField& omegaWallFunctionFvPatchScalarField::G(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            G_ = 0.0;
-        }
-
-        return G_;
-    }
-
-    return omegaPatch(master_).G();
-}
-
-
-scalarField& omegaWallFunctionFvPatchScalarField::omega(bool init)
-{
-    if (patch().index() == master_)
-    {
-        if (init)
-        {
-            omega_ = 0.0;
-        }
-
-        return omega_;
-    }
-
-    return omegaPatch(master_).omega(init);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), omega(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& omega0 = this->omega();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& omega = const_cast<FieldType&>(dimensionedInternalField());
-
-    forAll(*this, faceI)
-    {
-        label cellI = patch().faceCells()[faceI];
-
-        G[cellI] = G0[cellI];
-        omega[cellI] = omega0[cellI];
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void omegaWallFunctionFvPatchScalarField::updateCoeffs
-(
-    const scalarField& weights
-)
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const turbulenceModel& turbulence =
-        db().lookupObject<turbulenceModel>(turbulenceModel::typeName);
-
-    setMaster();
-
-    if (patch().index() == master_)
-    {
-        createAveragingWeights();
-        calculateTurbulenceFields(turbulence, G(true), omega(true));
-    }
-
-    const scalarField& G0 = this->G();
-    const scalarField& omega0 = this->omega();
-
-    typedef DimensionedField<scalar, volMesh> FieldType;
-
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbulence.GName())
-        );
-
-    FieldType& omega = const_cast<FieldType&>(dimensionedInternalField());
-
-    scalarField& omegaf = *this;
-
-    // only set the values if the weights are > tolerance
-    forAll(weights, faceI)
-    {
-        scalar w = weights[faceI];
-
-        if (w > tolerance_)
-        {
-            label cellI = patch().faceCells()[faceI];
-
-            G[cellI] = (1.0 - w)*G[cellI] + w*G0[cellI];
-            omega[cellI] = (1.0 - w)*omega[cellI] + w*omega0[cellI];
-            omegaf[faceI] = omega[cellI];
-        }
-    }
-
-    fvPatchField<scalar>::updateCoeffs();
-}
-
-
-void omegaWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    matrix.setValues(patch().faceCells(), patchInternalField());
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::manipulateMatrix
-(
-    fvMatrix<scalar>& matrix,
-    const Field<scalar>& weights
-)
-{
-    if (manipulatedMatrix())
-    {
-        return;
-    }
-
-    // filter weights so that we only apply the constraint where the
-    // weight > SMALL
-    DynamicList<label> constraintCells(weights.size());
-    DynamicList<scalar> constraintomega(weights.size());
-    const labelUList& faceCells = patch().faceCells();
-
-    const DimensionedField<scalar, volMesh>& omega =
-        dimensionedInternalField();
-
-    label nConstrainedCells = 0;
-
-
-    forAll(weights, faceI)
-    {
-        // only set the values if the weights are > tolerance
-        if (weights[faceI] > tolerance_)
-        {
-            nConstrainedCells++;
-
-            label cellI = faceCells[faceI];
-
-            constraintCells.append(cellI);
-            constraintomega.append(omega[cellI]);
-        }
-    }
-
-    if (debug)
-    {
-        Pout<< "Patch: " << patch().name()
-            << ": number of constrained cells = " << nConstrainedCells
-            << " out of " << patch().size()
-            << endl;
-    }
-
-    matrix.setValues
-    (
-        constraintCells,
-        scalarField(constraintomega.xfer())
-    );
-
-    fvPatchField<scalar>::manipulateMatrix(matrix);
-}
-
-
-void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchField<scalar>::write(os);
-    writeLocalEntries(os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    omegaWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
deleted file mode 100644
index 74eef728c..000000000
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ /dev/null
@@ -1,298 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::incompressible::omegaWallFunctionFvPatchScalarField
-
-Group
-    grpIcoWallFunctions
-
-Description
-    This boundary condition provides a wall function constraint on turbulnce
-    specific dissipation, omega.  The values are computed using:
-
-        \f[
-            \omega = sqrt(\omega_{vis}^2 + \omega_{log}^2)
-        \f]
-
-    where
-
-    \vartable
-        \omega_{vis} | omega in viscous region
-        \omega_{log} | omega in logarithmic region
-    \endvartable
-
-    Model described by Eqs.(14, 15) of:
-    \verbatim
-        Menter, F., Esch, T.
-        "Elements of Industrial Heat Transfer Prediction"
-        16th Brazilian Congress of Mechanical Engineering (COBEM),
-        Nov. 2001
-    \endverbatim
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        Cmu          | model coefficient       | no          | 0.09
-        kappa        | Von Karman constant     | no          | 0.41
-        E            | model coefficient       | no          | 9.8
-        beta1        | model coefficient       | no          | 0.075
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            omegaWallFunction;
-    }
-    \endverbatim
-
-SourceFiles
-    omegaWallFunctionFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef omegaWallFunctionFvPatchScalarField_H
-#define omegaWallFunctionFvPatchScalarField_H
-
-#include "fixedValueFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-class turbulenceModel;
-
-/*---------------------------------------------------------------------------*\
-             Class omegaWallFunctionFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class omegaWallFunctionFvPatchScalarField
-:
-    public fixedValueFvPatchField<scalar>
-{
-protected:
-
-    // Protected data
-
-        //- Tolerance used in weighted calculations
-        static scalar tolerance_;
-
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- beta1 coefficient
-        scalar beta1_;
-
-        //- Y+ at the edge of the laminar sublayer
-        scalar yPlusLam_;
-
-        //- Local copy of turbulence G field
-        scalarField G_;
-
-        //- Local copy of turbulence omega field
-        scalarField omega_;
-
-        //- Initialised flag
-        bool initialised_;
-
-        //- Master patch ID
-        label master_;
-
-        //- List of averaging corner weights
-        List<List<scalar> > cornerWeights_;
-
-
-    // Protected Member Functions
-
-        //- Check the type of the patch
-        virtual void checkType();
-
-        //- Write local wall function variables
-        virtual void writeLocalEntries(Ostream&) const;
-
-        //- Set the master patch - master is responsible for updating all
-        //  wall function patches
-        virtual void setMaster();
-
-        //- Create the averaging weights for cells which are bounded by
-        //  multiple wall function faces
-        virtual void createAveragingWeights();
-
-        //- Helper function to return non-const access to an omega patch
-        virtual omegaWallFunctionFvPatchScalarField& omegaPatch
-        (
-            const label patchI
-        );
-
-        //- Main driver to calculate the turbulence fields
-        virtual void calculateTurbulenceFields
-        (
-            const turbulenceModel& turbulence,
-            scalarField& G0,
-            scalarField& omega0
-        );
-
-        //- Calculate the omega and G
-        virtual void calculate
-        (
-            const turbulenceModel& turbulence,
-            const List<scalar>& cornerWeights,
-            const fvPatch& patch,
-            scalarField& G,
-            scalarField& omega
-        );
-
-        //- Return non-const access to the master patch ID
-        virtual label& master()
-        {
-            return master_;
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("omegaWallFunction");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        omegaWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        omegaWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        // omegaWallFunctionFvPatchScalarField
-        //  onto a new patch
-        omegaWallFunctionFvPatchScalarField
-        (
-            const omegaWallFunctionFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        omegaWallFunctionFvPatchScalarField
-        (
-            const omegaWallFunctionFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new omegaWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        omegaWallFunctionFvPatchScalarField
-        (
-            const omegaWallFunctionFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new omegaWallFunctionFvPatchScalarField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Access
-
-            //- Return non-const access to the master's G field
-            scalarField& G(bool init = false);
-
-            //- Return non-const access to the master's omega field
-            scalarField& omega(bool init = false);
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs(const scalarField& weights);
-
-            //- Manipulate matrix
-            virtual void manipulateMatrix(fvMatrix<scalar>& matrix);
-
-            //- Manipulate matrix with given weights
-            virtual void manipulateMatrix
-            (
-                fvMatrix<scalar>& matrix,
-                const scalarField& weights
-            );
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
deleted file mode 100644
index a152daae9..000000000
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ /dev/null
@@ -1,290 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kEpsilon.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(kEpsilon, 0);
-addToRunTimeSelectionTable(RASModel, kEpsilon, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kEpsilon::kEpsilon
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    C1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C1",
-            coeffDict_,
-            1.44
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.92
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.3
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> kEpsilon::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> kEpsilon::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> kEpsilon::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> kEpsilon::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool kEpsilon::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        C1_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void kEpsilon::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        return;
-    }
-
-    volScalarField G(GName(), nut_*2*magSqr(symm(fvc::grad(U_))));
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1_*G*epsilon_/k_
-      - fvm::Sp(C2_*epsilon_/k_, epsilon_)
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G
-      - fvm::Sp(epsilon_/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    nut_ = Cmu_*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
deleted file mode 100644
index b11e84097..000000000
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
+++ /dev/null
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::RASModels::kEpsilon
-
-Group
-    grpIcoRASTurbulence
-
-Description
-    Standard k-epsilon turbulence model for incompressible flows.
-
-    Reference:
-    \verbatim
-        Launder, B.E., and Spalding, D.B.,
-        "Mathematical Models of Turbulence",
-        Academic Press, 1972.
-
-        Launder, B.E., and Spalding, D.B.,
-        "Computational Methods for Turbulent Flows",
-        Comp. Meth in Appl Mech & Eng'g, Vol 3, 1974, pp 269-289.
-    \endverbatim
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        kEpsilonCoeffs
-        {
-            Cmu         0.09;
-            C1          1.44;
-            C2          1.92;
-            sigmaEps    1.3;
-        }
-    \endverbatim
-
-SourceFiles
-    kEpsilon.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kEpsilon_H
-#define kEpsilon_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class kEpsilon Declaration
-\*---------------------------------------------------------------------------*/
-
-class kEpsilon
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar C1_;
-            dimensionedScalar C2_;
-            dimensionedScalar sigmaEps_;
-
-
-        // Fields
-
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField nut_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kEpsilon");
-
-    // Constructors
-
-        //- Construct from components
-        kEpsilon
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~kEpsilon()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nut_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
deleted file mode 100644
index 9eada0bf2..000000000
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ /dev/null
@@ -1,472 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "kOmegaSST.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(kOmegaSST, 0);
-addToRunTimeSelectionTable(RASModel, kOmegaSST, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> kOmegaSST::F1(const volScalarField& CDkOmega) const
-{
-    tmp<volScalarField> CDkOmegaPlus = max
-    (
-        CDkOmega,
-        dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10)
-    );
-
-    tmp<volScalarField> arg1 = min
-    (
-        min
-        (
-            max
-            (
-                (scalar(1)/betaStar_)*sqrt(k_)/(omega_*y_),
-                scalar(500)*nu()/(sqr(y_)*omega_)
-            ),
-            (4*alphaOmega2_)*k_/(CDkOmegaPlus*sqr(y_))
-        ),
-        scalar(10)
-    );
-
-    return tanh(pow4(arg1));
-}
-
-
-tmp<volScalarField> kOmegaSST::F2() const
-{
-    tmp<volScalarField> arg2 = min
-    (
-        max
-        (
-            (scalar(2)/betaStar_)*sqrt(k_)/(omega_*y_),
-            scalar(500)*nu()/(sqr(y_)*omega_)
-        ),
-        scalar(100)
-    );
-
-    return tanh(sqr(arg2));
-}
-
-
-tmp<volScalarField> kOmegaSST::F3() const
-{
-    tmp<volScalarField> arg3 = min
-    (
-        150*nu()/(omega_*sqr(y_)),
-        scalar(10)
-    );
-
-    return 1 - tanh(pow4(arg3));
-}
-
-
-tmp<volScalarField> kOmegaSST::F23() const
-{
-    tmp<volScalarField> f23(F2());
-
-    if (F3_)
-    {
-        f23() *= F3();
-    }
-
-    return f23;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-kOmegaSST::kOmegaSST
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    alphaK1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK1",
-            coeffDict_,
-            0.85
-        )
-    ),
-    alphaK2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK2",
-            coeffDict_,
-            1.0
-        )
-    ),
-    alphaOmega1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega1",
-            coeffDict_,
-            0.5
-        )
-    ),
-    alphaOmega2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega2",
-            coeffDict_,
-            0.856
-        )
-    ),
-    gamma1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma1",
-            coeffDict_,
-            5.0/9.0
-        )
-    ),
-    gamma2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma2",
-            coeffDict_,
-            0.44
-        )
-    ),
-    beta1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta1",
-            coeffDict_,
-            0.075
-        )
-    ),
-    beta2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta2",
-            coeffDict_,
-            0.0828
-        )
-    ),
-    betaStar_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "betaStar",
-            coeffDict_,
-            0.09
-        )
-    ),
-    a1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "a1",
-            coeffDict_,
-            0.31
-        )
-    ),
-    b1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "b1",
-            coeffDict_,
-            1.0
-        )
-    ),
-    c1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "c1",
-            coeffDict_,
-            10.0
-        )
-    ),
-    F3_
-    (
-        Switch::lookupOrAddToDict
-        (
-            "F3",
-            coeffDict_,
-            false
-        )
-    ),
-
-    y_(wallDist::New(mesh_).y()),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    omega_
-    (
-        IOobject
-        (
-            "omega",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateOmega("omega", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(omega_, omegaMin_);
-
-    nut_ =
-    (
-        a1_*k_
-      / max
-        (
-            a1_*omega_,
-            b1_*F23()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
-        )
-    );
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> kOmegaSST::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> kOmegaSST::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> kOmegaSST::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool kOmegaSST::read()
-{
-    if (RASModel::read())
-    {
-        alphaK1_.readIfPresent(coeffDict());
-        alphaK2_.readIfPresent(coeffDict());
-        alphaOmega1_.readIfPresent(coeffDict());
-        alphaOmega2_.readIfPresent(coeffDict());
-        gamma1_.readIfPresent(coeffDict());
-        gamma2_.readIfPresent(coeffDict());
-        beta1_.readIfPresent(coeffDict());
-        beta2_.readIfPresent(coeffDict());
-        betaStar_.readIfPresent(coeffDict());
-        a1_.readIfPresent(coeffDict());
-        b1_.readIfPresent(coeffDict());
-        c1_.readIfPresent(coeffDict());
-        F3_.readIfPresent("F3", coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void kOmegaSST::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        return;
-    }
-
-    const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
-    volScalarField G(GName(), nut_*S2);
-
-    // Update omega and G at the wall
-    omega_.boundaryField().updateCoeffs();
-
-    const volScalarField CDkOmega
-    (
-        (2*alphaOmega2_)*(fvc::grad(k_) & fvc::grad(omega_))/omega_
-    );
-
-    const volScalarField F1(this->F1(CDkOmega));
-
-    // Turbulent frequency equation
-    tmp<fvScalarMatrix> omegaEqn
-    (
-        fvm::ddt(omega_)
-      + fvm::div(phi_, omega_)
-      - fvm::laplacian(DomegaEff(F1), omega_)
-     ==
-        gamma(F1)
-       *min(S2, (c1_/a1_)*betaStar_*omega_*max(a1_*omega_, b1_*F23()*sqrt(S2)))
-      - fvm::Sp(beta(F1)*omega_, omega_)
-      - fvm::SuSp
-        (
-            (F1 - scalar(1))*CDkOmega/omega_,
-            omega_
-        )
-    );
-
-    omegaEqn().relax();
-
-    omegaEqn().boundaryManipulate(omega_.boundaryField());
-
-    solve(omegaEqn);
-    bound(omega_, omegaMin_);
-
-    // Turbulent kinetic energy equation
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(F1), k_)
-     ==
-        min(G, c1_*betaStar_*k_*omega_)
-      - fvm::Sp(betaStar_*omega_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    nut_ = a1_*k_/max(a1_*omega_, b1_*F23()*sqrt(S2));
-    nut_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
deleted file mode 100644
index c64f5e36b..000000000
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ /dev/null
@@ -1,311 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::RASModels::kOmegaSST
-
-Description
-    Implementation of the k-omega-SST turbulence model for incompressible
-    flows.
-
-    Turbulence model described in
-    \verbatim
-        Menter, F., Esch, T.,
-        "Elements of Industrial Heat Transfer Prediction",
-        16th Brazilian Congress of Mechanical Engineering (COBEM),
-        Nov. 2001.
-    \endverbatim
-
-    with updated coefficients from
-    \verbatim
-        Menter, F. R., Kuntz, M., and Langtry, R.,
-        "Ten Years of Industrial Experience with the SST Turbulence Model",
-        Turbulence, Heat and Mass Transfer 4, 2003,
-        pp. 625 - 632.
-    \endverbatim
-
-    but with the consistent production terms from the 2001 paper as form in the
-    2003 paper is a typo, see
-    \verbatim
-        http://turbmodels.larc.nasa.gov/sst.html
-    \endverbatim
-
-    and the addition of the optional F3 term for rough walls from
-    \verbatim
-        Hellsten, A.
-        "Some Improvements in Menter’s k-omega-SST turbulence model"
-        29th AIAA Fluid Dynamics Conference,
-        AIAA-98-2554,
-        June 1998.
-    \endverbatim
-
-    Note that this implementation is written in terms of alpha diffusion
-    coefficients rather than the more traditional sigma (alpha = 1/sigma) so
-    that the blending can be applied to all coefficuients in a consistent
-    manner.  The paper suggests that sigma is blended but this would not be
-    consistent with the blending of the k-epsilon and k-omega models.
-
-    Also note that the error in the last term of equation (2) relating to
-    sigma has been corrected.
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        kOmegaSSTCoeffs
-        {
-            alphaK1     0.85;
-            alphaK2     1.0;
-            alphaOmega1 0.5;
-            alphaOmega2 0.856;
-            beta1       0.075;
-            beta2       0.0828;
-            betaStar    0.09;
-            gamma1      5/9;
-            gamma2      0.44;
-            a1          0.31;
-            b1          1.0;
-            c1          10.0;
-            F3          no;
-        }
-    \endverbatim
-
-SourceFiles
-    kOmegaSST.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef kOmegaSST_H
-#define kOmegaSST_H
-
-#include "RASModel.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                          Class kOmegaSST Declaration
-\*---------------------------------------------------------------------------*/
-
-class kOmegaSST
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-            dimensionedScalar alphaK1_;
-            dimensionedScalar alphaK2_;
-
-            dimensionedScalar alphaOmega1_;
-            dimensionedScalar alphaOmega2_;
-
-            dimensionedScalar gamma1_;
-            dimensionedScalar gamma2_;
-
-            dimensionedScalar beta1_;
-            dimensionedScalar beta2_;
-
-            dimensionedScalar betaStar_;
-
-            dimensionedScalar a1_;
-            dimensionedScalar b1_;
-            dimensionedScalar c1_;
-
-            Switch F3_;
-
-
-        // Fields
-
-            //- Wall distance
-            //  Note: different to wall distance in parent RASModel
-            //  which is for near-wall cells only
-            const volScalarField& y_;
-
-            volScalarField k_;
-            volScalarField omega_;
-            volScalarField nut_;
-
-
-    // Protected Member Functions
-
-        tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
-        tmp<volScalarField> F2() const;
-        tmp<volScalarField> F3() const;
-        tmp<volScalarField> F23() const;
-
-        tmp<volScalarField> blend
-        (
-            const volScalarField& F1,
-            const dimensionedScalar& psi1,
-            const dimensionedScalar& psi2
-        ) const
-        {
-            return F1*(psi1 - psi2) + psi2;
-        }
-
-        tmp<volScalarField> alphaK(const volScalarField& F1) const
-        {
-            return blend(F1, alphaK1_, alphaK2_);
-        }
-
-        tmp<volScalarField> alphaOmega(const volScalarField& F1) const
-        {
-            return blend(F1, alphaOmega1_, alphaOmega2_);
-        }
-
-        tmp<volScalarField> beta(const volScalarField& F1) const
-        {
-            return blend(F1, beta1_, beta2_);
-        }
-
-        tmp<volScalarField> gamma(const volScalarField& F1) const
-        {
-            return blend(F1, gamma1_, gamma2_);
-        }
-
-
-public:
-
-    //- Runtime type information
-    TypeName("kOmegaSST");
-
-
-    // Constructors
-
-        //- Construct from components
-        kOmegaSST
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~kOmegaSST()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", alphaK(F1)*nut_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for omega
-        tmp<volScalarField> DomegaEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DomegaEff", alphaOmega(F1)*nut_ + nu())
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence specific dissipation rate
-        virtual tmp<volScalarField> omega() const
-        {
-            return omega_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (
-                        "epsilon",
-                        mesh_.time().timeName(),
-                        mesh_
-                    ),
-                    betaStar_*k_*omega_,
-                    omega_.boundaryField().types()
-                )
-            );
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
deleted file mode 100644
index 6967db5ed..000000000
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
+++ /dev/null
@@ -1,214 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "laminar.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(RASModel, laminar, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-laminar::laminar
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volScalarField> laminar::nut() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "nut",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("nut", nu()().dimensions(), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::k() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("k", sqr(U_.dimensions()), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::epsilon() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "epsilon",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar
-            (
-                "epsilon", sqr(U_.dimensions())/dimTime, 0.0
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedSymmTensor
-            (
-                "R", sqr(U_.dimensions()), symmTensor::zero
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool laminar::read()
-{
-    return RASModel::read();
-}
-
-
-void laminar::correct()
-{
-    turbulenceModel::correct();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
deleted file mode 100644
index 75c4624c2..000000000
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ /dev/null
@@ -1,356 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "realizableKE.H"
-#include "addToRunTimeSelectionTable.H"
-
-#include "backwardsCompatibilityWallFunctions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(realizableKE, 0);
-addToRunTimeSelectionTable(RASModel, realizableKE, dictionary);
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-tmp<volScalarField> realizableKE::rCmu
-(
-    const volTensorField& gradU,
-    const volScalarField& S2,
-    const volScalarField& magS
-)
-{
-    tmp<volSymmTensorField> tS = dev(symm(gradU));
-    const volSymmTensorField& S = tS();
-
-    tmp<volScalarField> W
-    (
-        (2*sqrt(2.0))*((S&S)&&S)
-       /(
-            magS*S2
-          + dimensionedScalar("small", dimensionSet(0, 0, -3, 0, 0), SMALL)
-        )
-    );
-
-    tS.clear();
-
-    tmp<volScalarField> phis
-    (
-        (1.0/3.0)*acos(min(max(sqrt(6.0)*W, -scalar(1)), scalar(1)))
-    );
-    tmp<volScalarField> As = sqrt(6.0)*cos(phis);
-    tmp<volScalarField> Us = sqrt(S2/2.0 + magSqr(skew(gradU)));
-
-    return 1.0/(A0_ + As*Us*k_/epsilon_);
-}
-
-
-tmp<volScalarField> realizableKE::rCmu
-(
-    const volTensorField& gradU
-)
-{
-    const volScalarField S2(2*magSqr(dev(symm(gradU))));
-    tmp<volScalarField> magS = sqrt(S2);
-    return rCmu(gradU, S2, magS);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-realizableKE::realizableKE
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName,
-    const word& modelName
-)
-:
-    RASModel(modelName, U, phi, transport, turbulenceModelName),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-    A0_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "A0",
-            coeffDict_,
-            4.0
-        )
-    ),
-    C2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "C2",
-            coeffDict_,
-            1.9
-        )
-    ),
-    sigmak_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmak",
-            coeffDict_,
-            1.0
-        )
-    ),
-    sigmaEps_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "sigmaEps",
-            coeffDict_,
-            1.2
-        )
-    ),
-
-    k_
-    (
-        IOobject
-        (
-            "k",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateK("k", mesh_)
-    ),
-    epsilon_
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateEpsilon("epsilon", mesh_)
-    ),
-    nut_
-    (
-        IOobject
-        (
-            "nut",
-            runTime_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        autoCreateNut("nut", mesh_)
-    )
-{
-    bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
-
-    nut_ = rCmu(fvc::grad(U_))*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-
-    printCoeffs();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-tmp<volSymmTensorField> realizableKE::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
-            k_.boundaryField().types()
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> realizableKE::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nuEff()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> realizableKE::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> realizableKE::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-bool realizableKE::read()
-{
-    if (RASModel::read())
-    {
-        Cmu_.readIfPresent(coeffDict());
-        A0_.readIfPresent(coeffDict());
-        C2_.readIfPresent(coeffDict());
-        sigmak_.readIfPresent(coeffDict());
-        sigmaEps_.readIfPresent(coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void realizableKE::correct()
-{
-    RASModel::correct();
-
-    if (!turbulence_)
-    {
-        return;
-    }
-
-    const volTensorField gradU(fvc::grad(U_));
-    const volScalarField S2(2*magSqr(dev(symm(gradU))));
-    const volScalarField magS(sqrt(S2));
-
-    const volScalarField eta(magS*k_/epsilon_);
-    tmp<volScalarField> C1 = max(eta/(scalar(5) + eta), scalar(0.43));
-
-    volScalarField G(GName(), nut_*S2);
-
-    // Update epsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
-
-
-    // Dissipation equation
-    tmp<fvScalarMatrix> epsEqn
-    (
-        fvm::ddt(epsilon_)
-      + fvm::div(phi_, epsilon_)
-      - fvm::laplacian(DepsilonEff(), epsilon_)
-     ==
-        C1*magS*epsilon_
-      - fvm::Sp
-        (
-            C2_*epsilon_/(k_ + sqrt(nu()*epsilon_)),
-            epsilon_
-        )
-    );
-
-    epsEqn().relax();
-
-    epsEqn().boundaryManipulate(epsilon_.boundaryField());
-
-    solve(epsEqn);
-    bound(epsilon_, epsilonMin_);
-
-
-    // Turbulent kinetic energy equation
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(k_)
-      + fvm::div(phi_, k_)
-      - fvm::laplacian(DkEff(), k_)
-     ==
-        G - fvm::Sp(epsilon_/k_, k_)
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, kMin_);
-
-
-    // Re-calculate viscosity
-    nut_ = rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
-    nut_.correctBoundaryConditions();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
deleted file mode 100644
index 699479253..000000000
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
+++ /dev/null
@@ -1,211 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Class
-    Foam::incompressible::RASModels::realizableKE
-
-Group
-    grpIcoRASTurbulence
-
-Description
-    Realizable k-epsilon turbulence model for incompressible flows.
-
-    Model described in the paper:
-    \verbatim
-        "A New k-epsilon Eddy Viscosity Model for High Reynolds Number
-        Turbulent Flows"
-
-        Tsan-Hsing Shih, William W. Liou, Aamir Shabbir, Zhigang Tang and
-        Jiang Zhu
-
-        Computers and Fluids Vol. 24, No. 3, pp. 227-238, 1995
-    \endverbatim
-
-    The default model coefficients correspond to the following:
-    \verbatim
-        realizableKECoeffs
-        {
-            Cmu         0.09;
-            A0          4.0;
-            C2          1.9;
-            sigmak      1.0;
-            sigmaEps    1.2;
-        }
-    \endverbatim
-
-SourceFiles
-    realizableKE.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef realizableKE_H
-#define realizableKE_H
-
-#include "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class realizableKE Declaration
-\*---------------------------------------------------------------------------*/
-
-class realizableKE
-:
-    public RASModel
-{
-
-protected:
-
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar Cmu_;
-            dimensionedScalar A0_;
-            dimensionedScalar C2_;
-            dimensionedScalar sigmak_;
-            dimensionedScalar sigmaEps_;
-
-
-        // Fields
-
-            volScalarField k_;
-            volScalarField epsilon_;
-            volScalarField nut_;
-
-
-    // Protected Member Functions
-
-        tmp<volScalarField> rCmu
-        (
-            const volTensorField& gradU,
-            const volScalarField& S2,
-            const volScalarField& magS
-        );
-
-        tmp<volScalarField> rCmu(const volTensorField& gradU);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("realizableKE");
-
-    // Constructors
-
-        //- Construct from components
-        realizableKE
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = turbulenceModel::typeName,
-            const word& modelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~realizableKE()
-    {}
-
-
-    // Member Functions
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const
-        {
-            return nut_;
-        }
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", nut_/sigmak_ + nu())
-            );
-        }
-
-        //- Return the effective diffusivity for epsilon
-        tmp<volScalarField> DepsilonEff() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return epsilon_;
-        }
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
-
-        //- Read RASProperties dictionary
-        virtual bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/files b/src/turbulenceModels/incompressible/turbulenceModel/Make/files
deleted file mode 100644
index f770af1ec..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/Make/files
+++ /dev/null
@@ -1,7 +0,0 @@
-turbulenceModel.C
-laminar/laminar.C
-derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
-derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
-derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
-
-LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModel
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/options b/src/turbulenceModels/incompressible/turbulenceModel/Make/options
deleted file mode 100644
index 2af4fa4ba..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/Make/options
+++ /dev/null
@@ -1,8 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/transportModels
-
-LIB_LIBS = \
-    -lfiniteVolume
-
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
deleted file mode 100644
index 9c8e5e423..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ /dev/null
@@ -1,142 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "atmBoundaryLayerInletVelocityFvPatchVectorField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-atmBoundaryLayerInletVelocityFvPatchVectorField::
-atmBoundaryLayerInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchVectorField(p, iF),
-    atmBoundaryLayer()
-{}
-
-
-atmBoundaryLayerInletVelocityFvPatchVectorField::
-atmBoundaryLayerInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchVectorField(p, iF),
-    atmBoundaryLayer(patch().Cf(), dict)
-{
-    vectorField::operator=(U(patch().Cf()));
-}
-
-
-atmBoundaryLayerInletVelocityFvPatchVectorField::
-atmBoundaryLayerInletVelocityFvPatchVectorField
-(
-    const atmBoundaryLayerInletVelocityFvPatchVectorField& pvf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchVectorField(pvf, p, iF, mapper),
-    atmBoundaryLayer(pvf, mapper)
-{}
-
-
-atmBoundaryLayerInletVelocityFvPatchVectorField::
-atmBoundaryLayerInletVelocityFvPatchVectorField
-(
-    const atmBoundaryLayerInletVelocityFvPatchVectorField& pvf,
-    const DimensionedField<vector, volMesh>& iF
-)
-:
-    fixedValueFvPatchVectorField(pvf, iF),
-    atmBoundaryLayer(pvf)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void atmBoundaryLayerInletVelocityFvPatchVectorField::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    fixedValueFvPatchVectorField::autoMap(m);
-    atmBoundaryLayer::autoMap(m);
-}
-
-
-void atmBoundaryLayerInletVelocityFvPatchVectorField::rmap
-(
-    const fvPatchVectorField& pvf,
-    const labelList& addr
-)
-{
-    fixedValueFvPatchVectorField::rmap(pvf, addr);
-
-    const atmBoundaryLayerInletVelocityFvPatchVectorField& blpvf =
-        refCast<const atmBoundaryLayerInletVelocityFvPatchVectorField>(pvf);
-
-    atmBoundaryLayer::rmap(blpvf, addr);
-}
-
-
-void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
-{
-    fvPatchVectorField::write(os);
-    atmBoundaryLayer::write(os);
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchVectorField,
-    atmBoundaryLayerInletVelocityFvPatchVectorField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
deleted file mode 100644
index 870228368..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
+++ /dev/null
@@ -1,178 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 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/>.
-
-Class
-    Foam::incompressible::atmBoundaryLayerInletVelocityFvPatchVectorField
-
-Group
-    grpIcoRASBoundaryConditions grpInletBoundaryConditions
-
-Description
-    This boundary condition specifies a velocity inlet profile appropriate
-    for atmospheric boundary layers (ABL).
-
-    See Foam::incompressible::atmBoundaryLayer for details.
-
-    Example of the boundary condition specification:
-    \verbatim
-    ground
-    {
-        type            atmBoundaryLayerInletVelocity;
-        n               (1 0 0);
-        z               (0 0 1);
-        Uref            10.0;
-        Zref            20.0;
-        z0              uniform 0.1;
-        zGround         uniform 0.0;
-    }
-    \endverbatim
-
-SeeAlso
-    Foam::incompressible::atmBoundaryLayer,
-    Foam::incompressible::atmBoundaryLayerInletKFvPatchScalarField,
-    Foam::incompressible::atmBoundaryLayerInletEpsilonFvPatchScalarField
-
-SourceFiles
-    atmBoundaryLayerInletVelocityFvPatchVectorField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef atmBoundaryLayerInletVelocityFvPatchVectorField_H
-#define atmBoundaryLayerInletVelocityFvPatchVectorField_H
-
-#include "fvPatchFields.H"
-#include "fixedValueFvPatchFields.H"
-#include "atmBoundaryLayer.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-       Class atmBoundaryLayerInletVelocityFvPatchVectorField Declaration
-\*---------------------------------------------------------------------------*/
-
-class atmBoundaryLayerInletVelocityFvPatchVectorField
-:
-    public fixedValueFvPatchVectorField,
-    public atmBoundaryLayer
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("atmBoundaryLayerInletVelocity");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        atmBoundaryLayerInletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        atmBoundaryLayerInletVelocityFvPatchVectorField
-        (
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        // atmBoundaryLayerInletVelocityFvPatchVectorField onto a new patch
-        atmBoundaryLayerInletVelocityFvPatchVectorField
-        (
-            const atmBoundaryLayerInletVelocityFvPatchVectorField&,
-            const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new atmBoundaryLayerInletVelocityFvPatchVectorField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        atmBoundaryLayerInletVelocityFvPatchVectorField
-        (
-            const atmBoundaryLayerInletVelocityFvPatchVectorField&,
-            const DimensionedField<vector, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchVectorField> clone
-        (
-            const DimensionedField<vector, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new atmBoundaryLayerInletVelocityFvPatchVectorField(*this, iF)
-            );
-        }
-
-
-    // Member functions
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper&
-            );
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchVectorField&,
-                const labelList&
-            );
-
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
deleted file mode 100644
index 077e77fda..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ /dev/null
@@ -1,256 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulentHeatFluxTemperatureFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "incompressible/turbulenceModel/turbulenceModel.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    // declare specialization within 'Foam' namespace
-    template<>
-    const char* NamedEnum
-    <
-        Foam::incompressible::
-        turbulentHeatFluxTemperatureFvPatchScalarField::heatSourceType,
-        2
-    >::names[] =
-    {
-        "power",
-        "flux"
-    };
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-namespace Foam
-{
-
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-const NamedEnum
-<
-    turbulentHeatFluxTemperatureFvPatchScalarField::heatSourceType,
-    2
-> turbulentHeatFluxTemperatureFvPatchScalarField::heatSourceTypeNames_;
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulentHeatFluxTemperatureFvPatchScalarField::
-turbulentHeatFluxTemperatureFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedGradientFvPatchScalarField(p, iF),
-    heatSource_(hsPower),
-    q_(p.size(), 0.0),
-    alphaEffName_("undefinedAlphaEff")
-{}
-
-
-turbulentHeatFluxTemperatureFvPatchScalarField::
-turbulentHeatFluxTemperatureFvPatchScalarField
-(
-    const turbulentHeatFluxTemperatureFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
-    heatSource_(ptf.heatSource_),
-    q_(ptf.q_, mapper),
-    alphaEffName_(ptf.alphaEffName_)
-{}
-
-
-turbulentHeatFluxTemperatureFvPatchScalarField::
-turbulentHeatFluxTemperatureFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedGradientFvPatchScalarField(p, iF),
-    heatSource_(heatSourceTypeNames_.read(dict.lookup("heatSource"))),
-    q_("q", dict, p.size()),
-    alphaEffName_(dict.lookup("alphaEff"))
-{
-    if (dict.found("value") && dict.found("gradient"))
-    {
-        fvPatchField<scalar>::operator=(Field<scalar>("value", dict, p.size()));
-        gradient() = Field<scalar>("gradient", dict, p.size());
-    }
-    else
-    {
-        fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
-    }
-}
-
-
-turbulentHeatFluxTemperatureFvPatchScalarField::
-turbulentHeatFluxTemperatureFvPatchScalarField
-(
-    const turbulentHeatFluxTemperatureFvPatchScalarField& thftpsf
-)
-:
-    fixedGradientFvPatchScalarField(thftpsf),
-    heatSource_(thftpsf.heatSource_),
-    q_(thftpsf.q_),
-    alphaEffName_(thftpsf.alphaEffName_)
-{}
-
-
-turbulentHeatFluxTemperatureFvPatchScalarField::
-turbulentHeatFluxTemperatureFvPatchScalarField
-(
-    const turbulentHeatFluxTemperatureFvPatchScalarField& thftpsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedGradientFvPatchScalarField(thftpsf, iF),
-    heatSource_(thftpsf.heatSource_),
-    q_(thftpsf.q_),
-    alphaEffName_(thftpsf.alphaEffName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void turbulentHeatFluxTemperatureFvPatchScalarField::autoMap
-(
-    const fvPatchFieldMapper& m
-)
-{
-    scalarField::autoMap(m);
-    q_.autoMap(m);
-}
-
-
-void turbulentHeatFluxTemperatureFvPatchScalarField::rmap
-(
-    const fvPatchScalarField& ptf,
-    const labelList& addr
-)
-{
-    fixedGradientFvPatchScalarField::rmap(ptf, addr);
-
-    const turbulentHeatFluxTemperatureFvPatchScalarField& thftptf =
-        refCast<const turbulentHeatFluxTemperatureFvPatchScalarField>
-        (
-            ptf
-        );
-
-    q_.rmap(thftptf.q_, addr);
-}
-
-
-void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
-{
-    if (updated())
-    {
-        return;
-    }
-
-    const scalarField& alphaEffp =
-        patch().lookupPatchField<volScalarField, scalar>(alphaEffName_);
-
-    // retrieve (constant) specific heat capacity from transport dictionary
-    const IOdictionary& transportProperties =
-        db().lookupObject<IOdictionary>("transportProperties");
-    const scalar Cp0(readScalar(transportProperties.lookup("Cp0")));
-
-    switch (heatSource_)
-    {
-        case hsPower:
-        {
-            const scalar Ap = gSum(patch().magSf());
-            gradient() = q_/(Ap*Cp0*alphaEffp);
-            break;
-        }
-        case hsFlux:
-        {
-            gradient() = q_/(Cp0*alphaEffp);
-            break;
-        }
-        default:
-        {
-            FatalErrorIn
-            (
-                "turbulentHeatFluxTemperatureFvPatchScalarField"
-                "("
-                    "const fvPatch&, "
-                    "const DimensionedField<scalar, volMesh>&, "
-                    "const dictionary&"
-                ")"
-            )   << "Unknown heat source type. Valid types are: "
-                << heatSourceTypeNames_ << nl << exit(FatalError);
-        }
-    }
-
-    fixedGradientFvPatchScalarField::updateCoeffs();
-}
-
-
-void turbulentHeatFluxTemperatureFvPatchScalarField::write(Ostream& os) const
-{
-    fixedGradientFvPatchScalarField::write(os);
-    os.writeKeyword("heatSource") << heatSourceTypeNames_[heatSource_]
-        << token::END_STATEMENT << nl;
-    q_.writeEntry("q", os);
-    os.writeKeyword("alphaEff") << alphaEffName_ << token::END_STATEMENT << nl;
-    writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    turbulentHeatFluxTemperatureFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
deleted file mode 100644
index 3a7e1d849..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ /dev/null
@@ -1,228 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 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/>.
-
-Class
-    Foam::incompressible::turbulentHeatFluxTemperatureFvPatchScalarField
-
-Group
-    grpIcoRASBoundaryConditions grpWallBoundaryConditions
-
-Description
-    Fixed heat boundary condition to specify temperature gradient. Input
-    heat source either specified in terms of an absolute power [W], or as a
-    flux [W/m2].
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        heatSource   | heat source type: \c flux [W/m2] or \c power [W]| yes |
-        q            | heat source value       | yes          |
-        alphaEff     | turbulent thermal diffusivity field name | yes |
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            turbulentHeatFluxTemperature;
-        heatSource      flux;
-        q               uniform 10;
-        alphaEff        alphaEff;
-        value           uniform 300; // place holder
-    }
-    \endverbatim
-
-Note
-    - it is assumed that the units of \c alphaEff are [kg/m/s]
-    - the specific heat capcaity is read from the transport dictionary entry
-      \c Cp0
-
-SourceFiles
-    turbulentHeatFluxTemperatureFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef turbulentHeatFluxTemperatureFvPatchScalarFields_H
-#define turbulentHeatFluxTemperatureFvPatchScalarFields_H
-
-#include "fvPatchFields.H"
-#include "fixedGradientFvPatchFields.H"
-#include "NamedEnum.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-       Class turbulentHeatFluxTemperatureFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulentHeatFluxTemperatureFvPatchScalarField
-:
-    public fixedGradientFvPatchScalarField
-{
-public:
-
-    // Data types
-
-        //- Enumeration listing the possible hest source input modes
-        enum heatSourceType
-        {
-            hsPower,
-            hsFlux
-        };
-
-
-private:
-
-    // Private data
-
-        //- Heat source type names
-        static const NamedEnum<heatSourceType, 2> heatSourceTypeNames_;
-
-        //- Heat source type
-        heatSourceType heatSource_;
-
-        //- Heat power [W] or flux [W/m2]
-        //  NOTE: to be divided by density, rho, if used in kinematic form
-        scalarField q_;
-
-        //- Name of effective thermal diffusivity field
-        word alphaEffName_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("turbulentHeatFluxTemperature");
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        turbulentHeatFluxTemperatureFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        turbulentHeatFluxTemperatureFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given
-        //  turbulentHeatFluxTemperatureFvPatchScalarField onto
-        //  a new patch
-        turbulentHeatFluxTemperatureFvPatchScalarField
-        (
-            const turbulentHeatFluxTemperatureFvPatchScalarField&,
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        turbulentHeatFluxTemperatureFvPatchScalarField
-        (
-            const turbulentHeatFluxTemperatureFvPatchScalarField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentHeatFluxTemperatureFvPatchScalarField(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        turbulentHeatFluxTemperatureFvPatchScalarField
-        (
-            const turbulentHeatFluxTemperatureFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchScalarField> clone
-        (
-            const DimensionedField<scalar, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentHeatFluxTemperatureFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
-        }
-
-
-    // Member functions
-
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap(const fvPatchFieldMapper&);
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchScalarField&,
-                const labelList&
-            );
-
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
-
-        // I-O
-
-            //- Write
-            virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
deleted file mode 100644
index f14b68101..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
+++ /dev/null
@@ -1,245 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "laminar.H"
-#include "Time.H"
-#include "volFields.H"
-#include "fvcGrad.H"
-#include "fvcDiv.H"
-#include "fvmLaplacian.H"
-#include "addToRunTimeSelectionTable.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(laminar, 0);
-addToRunTimeSelectionTable(turbulenceModel, laminar, turbulenceModel);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-laminar::laminar
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-:
-    turbulenceModel(U, phi, transport, turbulenceModelName)
-{}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<laminar> laminar::New
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-{
-    return autoPtr<laminar>
-    (
-        new laminar(U, phi, transport, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-const dictionary& laminar::coeffDict() const
-{
-    return dictionary::null;
-}
-
-
-tmp<volScalarField> laminar::nut() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "nut",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("nut", nu()().dimensions(), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::nuEff() const
-{
-    return tmp<volScalarField>(new volScalarField("nuEff", nu()));
-}
-
-
-tmp<volScalarField> laminar::k() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "k",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar("k", sqr(U_.dimensions()), 0.0)
-        )
-    );
-}
-
-
-tmp<volScalarField> laminar::epsilon() const
-{
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "epsilon",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedScalar
-            (
-                "epsilon", sqr(U_.dimensions())/dimTime, 0.0
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::R() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "R",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedSymmTensor
-            (
-                "R", sqr(U_.dimensions()), symmTensor::zero
-            )
-        )
-    );
-}
-
-
-tmp<volSymmTensorField> laminar::devReff() const
-{
-    return tmp<volSymmTensorField>
-    (
-        new volSymmTensorField
-        (
-            IOobject
-            (
-                "devRhoReff",
-                runTime_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-           -nu()*dev(twoSymm(fvc::grad(U_)))
-        )
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
-{
-    return
-    (
-      - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(T(fvc::grad(U))))
-    );
-}
-
-
-tmp<fvVectorMatrix> laminar::divDevRhoReff
-(
-    const volScalarField& rho,
-    volVectorField& U
-) const
-{
-    volScalarField muEff("muEff", rho*nuEff());
-
-    return
-    (
-      - fvm::laplacian(muEff, U)
-      - fvc::div(muEff*dev(T(fvc::grad(U))))
-    );
-}
-
-
-void laminar::correct()
-{
-    turbulenceModel::correct();
-}
-
-
-bool laminar::read()
-{
-    return true;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
deleted file mode 100644
index 6e607c160..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ /dev/null
@@ -1,143 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "turbulenceModel.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "wallFvPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(turbulenceModel, 0);
-defineRunTimeSelectionTable(turbulenceModel, turbulenceModel);
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-turbulenceModel::turbulenceModel
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-:
-    regIOobject
-    (
-        IOobject
-        (
-            turbulenceModelName,
-            U.time().constant(),
-            U.db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        )
-    ),
-    runTime_(U.time()),
-    mesh_(U.mesh()),
-
-    U_(U),
-    phi_(phi),
-    transportModel_(transport),
-    y_(mesh_)
-{}
-
-
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-autoPtr<turbulenceModel> turbulenceModel::New
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& turbulenceModelName
-)
-{
-    // get model name, but do not register the dictionary
-    // otherwise it is registered in the database twice
-    const word modelType
-    (
-        IOdictionary
-        (
-            IOobject
-            (
-                "turbulenceProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        ).lookup("simulationType")
-    );
-
-    Info<< "Selecting turbulence model type " << modelType << endl;
-
-    turbulenceModelConstructorTable::iterator cstrIter =
-        turbulenceModelConstructorTablePtr_->find(modelType);
-
-    if (cstrIter == turbulenceModelConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "turbulenceModel::New(const volVectorField&, "
-            "const surfaceScalarField&, transportModel&, const word&)"
-        )   << "Unknown turbulenceModel type "
-            << modelType << nl << nl
-            << "Valid turbulenceModel types:" << endl
-            << turbulenceModelConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<turbulenceModel>
-    (
-        cstrIter()(U, phi, transport, turbulenceModelName)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void turbulenceModel::correct()
-{
-    if (mesh_.changing())
-    {
-        y_.correct();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
deleted file mode 100644
index 52684d712..000000000
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ /dev/null
@@ -1,246 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 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/>.
-
-Namespace
-    Foam::incompressible::turbulenceModels
-
-Description
-    Namespace for incompressible turbulence turbulence models.
-
-Class
-    Foam::incompressible::turbulenceModel
-
-Description
-    Abstract base class for incompressible turbulence models
-    (RAS, LES and laminar).
-
-SourceFiles
-    turbulenceModel.C
-    newTurbulenceModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef turbulenceModel_H
-#define turbulenceModel_H
-
-#include "primitiveFieldsFwd.H"
-#include "volFieldsFwd.H"
-#include "surfaceFieldsFwd.H"
-#include "fvMatricesFwd.H"
-#include "incompressible/transportModel/transportModel.H"
-#include "nearWallDist.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declarations
-class fvMesh;
-
-namespace incompressible
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class turbulenceModel Declaration
-\*---------------------------------------------------------------------------*/
-
-class turbulenceModel
-:
-    public regIOobject
-{
-
-protected:
-
-    // Protected data
-
-        const Time& runTime_;
-        const fvMesh& mesh_;
-
-        const volVectorField& U_;
-        const surfaceScalarField& phi_;
-
-        const transportModel& transportModel_;
-
-        //- Near wall distance boundary field
-        nearWallDist y_;
-
-
-private:
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        turbulenceModel(const turbulenceModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const turbulenceModel&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("turbulenceModel");
-
-
-    // Declare run-time New selection table
-
-        declareRunTimeNewSelectionTable
-        (
-            autoPtr,
-            turbulenceModel,
-            turbulenceModel,
-            (
-                const volVectorField& U,
-                const surfaceScalarField& phi,
-                const transportModel& transport,
-                const word& turbulenceModelName
-            ),
-            (U, phi, transport, turbulenceModelName)
-        );
-
-
-    // Constructors
-
-        //- Construct from components
-        turbulenceModel
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = typeName
-        );
-
-
-    // Selectors
-
-        //- Return a reference to the selected turbulence model
-        static autoPtr<turbulenceModel> New
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& turbulenceModelName = typeName
-        );
-
-
-    //- Destructor
-    virtual ~turbulenceModel()
-    {}
-
-
-    // Member Functions
-
-        //- Const access to the coefficients dictionary
-        virtual const dictionary& coeffDict() const = 0;
-
-        //- Helper function to return the nam eof the turbulence G field
-        inline word GName() const
-        {
-            return word(type() + ":G");
-        }
-
-        //- Access function to velocity field
-        inline const volVectorField& U() const
-        {
-            return U_;
-        }
-
-        //- Access function to flux field
-        inline const surfaceScalarField& phi() const
-        {
-            return phi_;
-        }
-
-        //- Access function to incompressible transport model
-        inline const transportModel& transport() const
-        {
-            return transportModel_;
-        }
-
-        //- Return the near wall distances
-        const nearWallDist& y() const
-        {
-            return y_;
-        }
-
-        //- Return the laminar viscosity
-        inline tmp<volScalarField> nu() const
-        {
-            return transportModel_.nu();
-        }
-
-        //- Return the turbulence viscosity
-        virtual tmp<volScalarField> nut() const = 0;
-
-        //- Return the effective viscosity
-        virtual tmp<volScalarField> nuEff() const = 0;
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const = 0;
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const = 0;
-
-        //- Return the Reynolds stress tensor
-        virtual tmp<volSymmTensorField> R() const = 0;
-
-        //- Return the effective stress tensor including the laminar stress
-        virtual tmp<volSymmTensorField> devReff() const = 0;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const = 0;
-
-        //- Return the source term for the momentum equation
-        virtual tmp<fvVectorMatrix> divDevRhoReff
-        (
-            const volScalarField& rho,
-            volVectorField& U
-        ) const = 0;
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct() = 0;
-
-        //- Read LESProperties or RASProperties dictionary
-        virtual bool read() = 0;
-
-        //- Default dummy write function
-        virtual bool writeData(Ostream&) const
-        {
-            return true;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
index dbda14ce2..050a277e0 100644
--- a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
     div(phi,k) Gauss limitedLinear 1;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
index 8dc2a96f1..26ca09c49 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
@@ -29,7 +29,7 @@ boundaryField
     }
     ground
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -37,7 +37,7 @@ boundaryField
     }
     blockedFaces
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -45,7 +45,7 @@ boundaryField
     }
     baffleWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
index 408330319..a9ff01787 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
@@ -29,17 +29,17 @@ boundaryField
     }
     ground
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1.5;
     }
     blockedFaces
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1.5;
     }
     baffleWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1.5;
     }
     baffleCyclic_half0
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
index 408330319..a9ff01787 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
@@ -29,17 +29,17 @@ boundaryField
     }
     ground
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1.5;
     }
     blockedFaces
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1.5;
     }
     baffleWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1.5;
     }
     baffleCyclic_half0
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/mut b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut
similarity index 89%
rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/mut
rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut
index da762e68d..50a3a27e9 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/mut
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -28,7 +28,7 @@ boundaryField
     }
     ground
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -36,7 +36,7 @@ boundaryField
     }
     blockedFaces
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -44,7 +44,7 @@ boundaryField
     }
     baffleWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/RASProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/RASProperties
deleted file mode 100644
index 2f7a80d57..000000000
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/RASProperties
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel PDRkEpsilon;
-
-PDRkEpsilonCoeffs
-{
-    Cmu              0.09;
-    C1               1.44;
-    C2               1.92;
-    C3               0;
-    C4               0.1;
-    alphah           1;
-    alphak           1;
-    alphaEps         0.76923;
-}
-
-turbulence      on;
-
-printCoeffs     on;
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
index 3721a46a2..3cf4138c4 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
@@ -15,7 +15,28 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel PDRkEpsilon;
+
+    PDRkEpsilonCoeffs
+    {
+        Cmu              0.09;
+        C1               1.44;
+        C2               1.92;
+        C3               0;
+        C4               0.1;
+        alphah           1;
+        alphak           1;
+        alphaEps         0.76923;
+    }
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
index a8ce95c9c..b48f2bf73 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@@ -78,12 +78,12 @@ dictionaryReplacement
         {
             blockedFaces
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.1;
             }
             baffleWall
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 1e-5;
             }
             baffleCyclic_half0
@@ -103,12 +103,12 @@ dictionaryReplacement
         {
             blockedFaces
             {
-                type        compressible::kqRWallFunction;
+                type        kqRWallFunction;
                 value       uniform 1.5;
          }
             baffleWall
             {
-                type        compressible::kqRWallFunction;
+                type        kqRWallFunction;
                 value       uniform 1.5;
             }
             baffleCyclic_half0
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
index b8943aa44..979d0d7dc 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
@@ -50,7 +50,7 @@ divSchemes
 
     div((Su*grad(b)))               Gauss linear;
     div((U+((Su*Xi)*grad(b))))      Gauss linear;
-    div((muEff*dev2(T(grad(U)))))   Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U)))))   Gauss linear;
     div(U)                          Gauss linear;
 }
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
similarity index 95%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
index a9920120d..113acd86c 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [ 0 2 -1 0 0 0 0 ];
 
 internalField   uniform 0;
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
index 3721a46a2..b9a4c7ca8 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        LaunderSharmaKE;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
index c23bdd6ac..359b92b03 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
@@ -49,7 +49,7 @@ divSchemes
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
index fed15ed84..9cb713ec9 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     piston
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     liner
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     cylinderHead
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k
index 3b0e37804..fb951423a 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/k
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/k
@@ -23,17 +23,17 @@ boundaryField
 {
     piston
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 4;
     }
     liner
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 4;
     }
     cylinderHead
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 4;
     }
 }
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/mut b/tutorials/combustion/engineFoam/kivaTest/-180/nut
similarity index 87%
rename from tutorials/combustion/engineFoam/kivaTest/-180/mut
rename to tutorials/combustion/engineFoam/kivaTest/-180/nut
index 22cccd07d..68a368eb0 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/mut
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "-180";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     piston
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     liner
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     cylinderHead
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
index 24684a3ec..0b12967f8 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     piston
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          1326;
         startFace       79522;
     }
     liner
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          2710;
         startFace       80848;
     }
     cylinderHead
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          2184;
         startFace       83558;
     }
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
index a92565fef..ed155cb77 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
@@ -53,7 +53,7 @@ divSchemes
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphaSgs b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
similarity index 98%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphaSgs
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
index 91c0c2894..6de647070 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaSgs;
+    object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
similarity index 89%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
index 9da5b0c67..f7a34d206 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/muSgs
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
@@ -12,13 +12,13 @@ FoamFile
     format          ascii;
     location        "0";
     class           volScalarField;
-    object          muSgs;
+    object          nut;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -32,7 +32,7 @@ boundaryField
 
     ground
     {
-        type            mutUSpaldingWallFunction;
+        type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
 
@@ -50,7 +50,7 @@ boundaryField
 
     region0_to_pyrolysisRegion_coupledWall
     {
-        type            mutUSpaldingWallFunction;
+        type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties
deleted file mode 100644
index 5ecdc02d1..000000000
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/LESProperties
+++ /dev/null
@@ -1,93 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           cubeRootVol;
-
-turbulence      on;
-
-printCoeffs     on;
-
-oneEqEddyCoeffs
-{
-    Prt             1;
-}
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
index 098d0823a..097319268 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
@@ -17,7 +17,84 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel        kEqn;
+
+    delta           cubeRootVol;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    kEqnCoeffs
+    {
+        Prt             1;
+    }
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
index a5dcaf45b..1173de15c 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
         h               limitedLinear 1;
     };
 
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phiU,p)     Gauss linear;
     div(Ji,Ii_h)    Gauss upwind;
 }
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
similarity index 94%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs
rename to tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
index 5daa28149..b9d5bb084 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaSgs;
+    object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -24,7 +24,6 @@ boundaryField
     ground
     {
         type        compressible::alphatWallFunction;
-        mut         muSgs;
         value       uniform 0;
     }
 
@@ -46,7 +45,6 @@ boundaryField
     "(region0_to.*)"
     {
         type        compressible::alphatWallFunction;
-        mut         muSgs;
         value       uniform 0;
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/muSgs b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
similarity index 91%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/muSgs
rename to tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
index cf1d55136..6bce27260 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/muSgs
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
@@ -11,10 +11,10 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      muSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -43,7 +43,7 @@ boundaryField
 
     "(region0_to.*)"
     {
-        type            mutUSpaldingWallFunction;
+        type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 28496ffcf..5528c96c7 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -24,9 +24,11 @@ runApplication topoSet -dict system/fBurner.topoSetDict
 
 runApplication createPatch -overwrite
 
-decomposePar -force > log.decomposePar.log 2>&1
+decomposePar -force > log.decomposePar 2>&1
 
-decomposePar -region panelRegion > log.decomposeParPanelRegion.log 2>&1
+decomposePar -region panelRegion > log.decomposeParPanelRegion 2>&1
+
+decomposePar -fields > log.decomposePar 2>&1
 
 runParallel `getApplication` 6
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/LESProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/LESProperties
deleted file mode 100644
index 5ecdc02d1..000000000
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/LESProperties
+++ /dev/null
@@ -1,93 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           cubeRootVol;
-
-turbulence      on;
-
-printCoeffs     on;
-
-oneEqEddyCoeffs
-{
-    Prt             1;
-}
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
index 098d0823a..94eb369ba 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
@@ -17,7 +17,83 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
 
+LES
+{
+    LESModel        kEqn;
+
+    delta           cubeRootVol;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    kEqnCoeffs
+    {
+        Prt             1;
+    }
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
index 275212626..0ca1dcaa6 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
         CO2             linearUpwind grad(CO2);
         h               linearUpwind grad(h);
     };
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,K)          Gauss limitedLinear 1;
     div(Ji,Ii_h)        Gauss upwind;
 }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
similarity index 98%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
index 203285a6c..fe217e29e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      muSgs;
+    object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
similarity index 95%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
index 5495f422b..d22df48d1 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties
deleted file mode 100644
index c24a9553b..000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties
+++ /dev/null
@@ -1,82 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel       oneEqEddy;
-
-delta          cubeRootVol;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-        maxDeltaRatio   1.1;
-    }
-    Cdelta           0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-        maxDeltaRatio   1.1;
-    }
-    Aplus            26;
-    Cdelta           0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
index 098d0823a..2b6d52fc7 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
@@ -14,10 +14,75 @@ FoamFile
     location    "constant";
     object      turbulenceProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel       kEqn;
+
+    delta          cubeRootVol;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+            maxDeltaRatio   1.1;
+        }
+        Cdelta           0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+            maxDeltaRatio   1.1;
+        }
+        Aplus            26;
+        Cdelta           0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index efa1275f2..406f98c2a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
         CO2             limitedLinear01 1;
         h               limitedLinear 1;
     };
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,omega)  Gauss limitedLinear 1;
     div(phi,K)      Gauss limitedLinear 1;
     div(U)          Gauss linear;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
similarity index 97%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs
rename to tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
index d94861f4b..eee8d350d 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      muSgs;
+    object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -37,6 +37,7 @@ boundaryField
     {
         type            zeroGradient;
     }
+
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
similarity index 94%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs
rename to tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
index ed7509d9f..f626af566 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -37,7 +37,6 @@ boundaryField
     {
         type            zeroGradient;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties
deleted file mode 100644
index 12e4f39bd..000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel       oneEqEddy;
-
-delta          cubeRootVol;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-oneEqEddyCoeffs
-{
-    ck      0.07;
-}
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-        maxDeltaRatio   1.1;
-    }
-    Cdelta           0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-        maxDeltaRatio   1.1;
-    }
-    Aplus            26;
-    Cdelta           0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
index f97f6389b..fc866e336 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
@@ -13,10 +13,80 @@ FoamFile
     location    "constant";
     object      turbulenceProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel       kEqn;
+
+    delta          cubeRootVol;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+
+    kEqnCoeffs
+    {
+        ck      0.07;
+    }
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+            maxDeltaRatio   1.1;
+        }
+        Cdelta           0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+            maxDeltaRatio   1.1;
+        }
+        Aplus            26;
+        Cdelta           0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
index e82354947..fbb43d9b9 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
         CO2             limitedLinear01 1;
         h               limitedLinear 1;
     };
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(Ji,Ii_h)    Gauss upwind;
 }
 
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
index 4e19f9c7d..48b4e3fff 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
     div(phi,k) Gauss limitedLinear 1;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/epsilon
index c6f28faee..8c7abfb78 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/epsilon
@@ -23,27 +23,27 @@ boundaryField
 {
     front
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     back
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     porosityWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/k
index b92ab42af..acbc36ec2 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/k
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     back
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     porosityWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     inlet
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/nut
similarity index 85%
rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/mut
rename to tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/nut
index 6f779fd41..4170dde35 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/mut
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSchemes
index cec14e1fb..49aa2c4c8 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
     div((rho*R))    Gauss linear;
     div(R)          Gauss linear;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/mut b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
similarity index 86%
rename from tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/mut
rename to tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
index 21f395468..1272c0822 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/mut
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
@@ -11,21 +11,21 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "${FOAM_CASE}/constant/caseSettings"
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
 boundaryField
 {
-    inlet       { $:calculated.mut; }
-    outlet      { $:calculated.mut; }
-    movingWalls { $:wall.mut; }
+    inlet       { $:calculated.nut; }
+    outlet      { $:calculated.nut; }
+    movingWalls { $:wall.nut; }
     staticWalls { $movingWalls; }
 
     #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
index 7c492476c..6224731ba 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
@@ -22,7 +22,7 @@ calculated
         type            calculated;
         value           uniform 0;
     }
-    mut
+    nut
     {
         type            calculated;
         value           uniform 0;
@@ -99,19 +99,19 @@ wall
 
     k
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform $:innerInlet.k;
     }
 
     epsilon
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform $:innerInlet.epsilon;
     }
 
-    mut
+    nut
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties
index c2021e727..cd2daf822 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes
index 4256201f4..1cd4e17a5 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(meshPhi,p)  Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphaSgs b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphaSgs
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuSgs b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
similarity index 98%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuSgs
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
index 608ec8c46..726b637f7 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuSgs
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      nuSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/LESProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/LESProperties
deleted file mode 100644
index b78b63e5e..000000000
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/LESProperties
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-turbulence      on;
-
-printCoeffs     on;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
index 43b78ef41..581ceffc7 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -32,12 +32,14 @@ FoamFile
     upperWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          223;
         startFace       24257;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          250;
         startFace       24480;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
index a925d3cc2..dccceff3d 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
@@ -15,7 +15,79 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel        kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           cubeRootVol;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
index 51d323683..36d3193af 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,muTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
index c6f28faee..8c7abfb78 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
@@ -23,27 +23,27 @@ boundaryField
 {
     front
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     back
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     porosityWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
index b92ab42af..acbc36ec2 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     back
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     porosityWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     inlet
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
similarity index 85%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
index 6f779fd41..4170dde35 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/mut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
index 5d15eae6c..dce2ee09f 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
     div((rho*R))    Gauss linear;
     div(R)          Gauss linear;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
index 6f1ace6a1..cfc9a229b 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
@@ -23,13 +23,13 @@ boundaryField
 {
     movingWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           $internalField;
     }
 
     fixedWalls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           $internalField;
     }
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
index 6917b826d..72d1287df 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
@@ -23,12 +23,12 @@ boundaryField
 {
     movingWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.00325;
     }
     fixedWalls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.00325;
     }
     frontAndBack
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
similarity index 91%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/0/mut
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
index db1e79f1d..94c53c3de 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/mut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     movingWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
index 5a9f7e014..dc890e42e 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
@@ -23,7 +23,7 @@ boundaryField
 {
     movingWall
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
index 3721a46a2..02fa2df1b 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
index 7510de7b7..c2728910f 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
     div((rho*R))    Gauss linear;
     div(R)          Gauss linear;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
index dcbf83049..07e4effd3 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
@@ -23,13 +23,13 @@ boundaryField
 {
     rotor
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 20;
     }
 
     stator
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 20;
     }
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
index 29b185dea..60208ba13 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
@@ -23,13 +23,13 @@ boundaryField
 {
     rotor
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 
     stator
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/mut b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
similarity index 88%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/mut
rename to tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
index 98af49fbc..6ca6d3aef 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/mut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,13 +23,13 @@ boundaryField
 {
     rotor
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     stator
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
index db6494d80..ddea2bbda 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,h)      Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,K)      Gauss linear;
 }
 
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
index 33ecb425e..b2a20bdcd 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
@@ -17,39 +17,39 @@ FoamFile
 
 dimensions      [1 -1 -1 0 0 0 0];
 
-internalField   uniform 0;
+internalField   uniform 1e-3;
 
 boundaryField
 {
     front
     {
         type            compressible::alphatWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
     back
     {
         type            compressible::alphatWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
     walls
     {
         type            compressible::alphatWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
     porosityWall
     {
         type            compressible::alphatWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
     inlet
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
index c6f28faee..8c7abfb78 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
@@ -23,27 +23,27 @@ boundaryField
 {
     front
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     back
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     porosityWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
index b92ab42af..acbc36ec2 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     back
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     porosityWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     inlet
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/nut
similarity index 85%
rename from tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
rename to tutorials/compressible/rhoPimplecFoam/angledDuct/0/nut
index 6f779fd41..4170dde35 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes
index 5d15eae6c..dce2ee09f 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes
@@ -39,7 +39,7 @@ divSchemes
     div((rho*R))    Gauss linear;
     div(R)          Gauss linear;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
index f83203612..232bd728b 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -28,7 +28,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,e)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
index 12c9b362e..21b1e98ef 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -23,31 +23,31 @@ boundaryField
 {
     front
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     back
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     porosityWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
index 3dbe46f03..cd7aa3109 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
     back
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
     porosityWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
similarity index 85%
rename from tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
index a01a5a0ee..4362a65a8 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/mut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [ 0 2 -1 0 0 0 0 ];
 
 internalField   uniform 0;
 
@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     back
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     porosityWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
index f83203612..232bd728b 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -28,7 +28,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,e)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
index 12c9b362e..21b1e98ef 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
@@ -23,31 +23,31 @@ boundaryField
 {
     front
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     back
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     porosityWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 200;
     }
 
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
index 3dbe46f03..cd7aa3109 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
     back
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
     porosityWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
similarity index 85%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
rename to tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
index a01a5a0ee..fcb2bc9b0 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     back
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     porosityWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/RASProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
index 76e163242..7a2d7d0e5 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
@@ -20,24 +20,28 @@ FoamFile
     front
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          700;
         startFace       63400;
     }
     back
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          700;
         startFace       64100;
     }
     walls
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          1400;
         startFace       64800;
     }
     porosityWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          1600;
         startFace       66200;
     }
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
index b4ca79e3c..7c3213ef9 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     default         none;
 
     div(phi,U)      bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,e)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/epsilon b/tutorials/compressible/rhoSimplecFoam/squareBend/0/epsilon
index 9161ca617..71b9c782d 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/epsilon
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     Default_Boundary_Region
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/k b/tutorials/compressible/rhoSimplecFoam/squareBend/0/k
index baffcd16d..7ee52f8db 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/k
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/k
@@ -23,7 +23,7 @@ boundaryField
 {
     Default_Boundary_Region
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
     inlet
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/mut b/tutorials/compressible/rhoSimplecFoam/squareBend/0/nut
similarity index 92%
rename from tutorials/compressible/rhoSimplecFoam/squareBend/0/mut
rename to tutorials/compressible/rhoSimplecFoam/squareBend/0/nut
index eb4656f29..ac8d562f4 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/mut
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     Default_Boundary_Region
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/RASProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/turbulenceProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
index 5a12a4e1d..665b390b9 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     default             none;
 
     div(phi,U)          bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U)))))      Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U)))))      Gauss linear;
     div(phi,e)          bounded Gauss upwind;
     div(phi,epsilon)    bounded Gauss upwind;
     div(phi,k)          bounded Gauss upwind;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index 4d56bbf40..0b421e801 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,e)      Gauss limitedLinear 1;
     div(phi,K)      Gauss limitedLinear 1;
     div(phiv,p)     Gauss limitedLinear 1;
-    div((muEff*dev2(T(grad(U))))) Gauss linear 1;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear 1;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index d42c248c2..85d4f97a6 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,e)      Gauss limitedLinear 1;
     div(phi,K)      Gauss limitedLinear 1;
     div(phiv,p)     Gauss limitedLinear 1;
-    div((muEff*dev2(T(grad(U))))) Gauss linear 1;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear 1;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
index 9a65ce7ee..867915923 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
@@ -39,7 +39,7 @@ boundaryField
     }
     WALL10
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
index 552f881f4..807d2a2b3 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
@@ -39,7 +39,7 @@ boundaryField
     }
     WALL10
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1000;
     }
 }
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
similarity index 92%
rename from tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
index d10d50870..b8c80af97 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -37,7 +37,7 @@ boundaryField
     }
     WALL10
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties
deleted file mode 100644
index 34805a0b2..000000000
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        LaunderSharmaKE;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
index b6f0d1102..becd8320f 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
@@ -39,6 +39,7 @@ FoamFile
     WALL10
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          260;
         startFace       160170;
     }
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
index 3721a46a2..b9a4c7ca8 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        LaunderSharmaKE;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index ec1368d9c..e43f10e9b 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phiv,p)     Gauss limitedLinear 1;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
index a7bd5b6bb..baba5a800 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
@@ -46,7 +46,7 @@ boundaryField
     }
     prismWall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 266000;
     }
     defaultFaces
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k
index 2917c4e84..61815273a 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/k
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/k
@@ -46,7 +46,7 @@ boundaryField
     }
     prismWall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1000;
     }
     defaultFaces
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/mut b/tutorials/compressible/sonicFoam/ras/prism/0/nut
similarity index 93%
rename from tutorials/compressible/sonicFoam/ras/prism/0/mut
rename to tutorials/compressible/sonicFoam/ras/prism/0/nut
index 61d98a744..3035025dd 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/mut
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -43,7 +43,7 @@ boundaryField
     }
     prismWall
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     defaultFaces
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index bf71cbee7..6519c5e77 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phiv,p)     Gauss limitedLinear 1;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
index 2ea94995a..9052cd188 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 7f51468ad..cbc48629e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,T)      bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 31ca07d47..590a482d4 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -15,13 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-    "libincompressibleTransportModels.so"
-);
-
 application     buoyantBoussinesqSimpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index bba4ac8e0..b64a3959f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,R)      bounded Gauss upwind;
     div(R)          Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
index 23851291d..892d69375 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     ceiling
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     fixedWalls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
index 62dd72207..8e5e6563e 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     ceiling
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     fixedWalls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
similarity index 85%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/mut
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
index 3da3e391b..a4ff41498 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/mut
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
index 9ca38f037..d156cf98b 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,K)      Gauss linear;
     div(phi,Ekp)    Gauss linear;
     div(R)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
index da6d89154..f1ac11910 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
     topAndBottom
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
     hot
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
     cold
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
index 886667fb5..ccdab2054 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
     topAndBottom
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
     hot
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
     cold
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut
similarity index 83%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/mut
rename to tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut
index 0ecb8672d..bc7b91040 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
     topAndBottom
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
     hot
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
     cold
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
index 423815a2d..481f4e64d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
     topAndBottom
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
     hot
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
     cold
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
deleted file mode 100644
index be86bc1ef..000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kOmegaSST;
-
-turbulence          on;
-
-printCoeffs         on;
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
similarity index 89%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/RASProperties
rename to tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
index e0e6b776a..beee8bdf0 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/RASProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
@@ -10,16 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      RASProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kOmegaSST;
+RAS
+{
+    RASModel            kOmegaSST;
 
-turbulence      on;
+    turbulence          on;
 
-printCoeffs     on;
+    printCoeffs         on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index 5e55527b8..d2738ff36 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,k)      bounded Gauss limitedLinear 0.2;
     div(phi,epsilon) bounded Gauss limitedLinear 0.2;
     div(phi,omega) bounded Gauss limitedLinear 0.2;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
index 7ac88b923..e850a8a82 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
@@ -26,7 +26,7 @@ boundaryField
 
     floor
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -34,7 +34,7 @@ boundaryField
     }
     ceiling
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches
index fd5f3f8c4..c9385a0f6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches
@@ -14,19 +14,19 @@ alphat
 
 epsilon
 {
-    type            compressible::epsilonWallFunction;
+    type            epsilonWallFunction;
     value           uniform 0.01;
 }
 
 k
 {
-    type            compressible::kqRWallFunction;
+    type            kqRWallFunction;
     value           uniform 0.01;
 }
 
-mut
+nut
 {
-    type            mutkWallFunction;
+    type            nutkWallFunction;
     value           uniform 0;
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
index 97f41e6e2..e231033d1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
@@ -26,12 +26,12 @@ boundaryField
 
     floor
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     ceiling
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     inlet
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
similarity index 91%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
index 329027bb9..53df88227 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -26,7 +26,7 @@ boundaryField
 
     floor
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -34,7 +34,7 @@ boundaryField
     }
     ceiling
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/RASProperties
deleted file mode 100644
index 5eeb61a9a..000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/RASProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kEpsilon;
-
-turbulence          on;
-
-printCoeffs         on;
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
similarity index 89%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/RASProperties
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
index a4937b503..1c094d0a3 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/RASProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
@@ -10,16 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      RASProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kEpsilon;
+RAS
+{
+    RASModel            kEpsilon;
 
-turbulence      on;
+    turbulence          on;
 
-printCoeffs     on;
+    printCoeffs         on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
index f35c15f10..78f6a784a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
@@ -44,6 +44,6 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-libs ("libthermalBaffleModels.so" "libcompressibleRASModels.so");
+libs ("libthermalBaffleModels.so");
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
index 9881bbd43..0c8ae95a6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@@ -33,18 +33,18 @@ divSchemes
     div(phi,k)      bounded Gauss limitedLinear 0.2;
     div(phi,epsilon) bounded Gauss limitedLinear 0.2;
     div(phi,omega) bounded Gauss limitedLinear 0.2;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
 {
     default         none;
-    laplacian(muEff,U) Gauss linear uncorrected;
+    laplacian((rho*nuEff),U) Gauss linear uncorrected;
     laplacian(rhorAUf,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
-    laplacian(DkEff,k) Gauss linear uncorrected;
-    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
-    laplacian(DomegaEff,omega) Gauss linear uncorrected;
+    laplacian((rho*DkEff),k) Gauss linear uncorrected;
+    laplacian((rho*DepsilonEff),epsilon) Gauss linear uncorrected;
+    laplacian((rho*DomegaEff),omega) Gauss linear uncorrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon
index da6d89154..f1ac11910 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
     topAndBottom
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
     hot
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
     cold
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 4e-06;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k
index 886667fb5..ccdab2054 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
     topAndBottom
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
     hot
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
     cold
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 3.75e-04;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut
similarity index 83%
rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/mut
rename to tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut
index 0ecb8672d..bc7b91040 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
     topAndBottom
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
     hot
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
     cold
     {
-        type            mutUWallFunction;
+        type            nutUWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega
index 423815a2d..481f4e64d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega
@@ -23,22 +23,22 @@ boundaryField
 {
     frontAndBack
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
     topAndBottom
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
     hot
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
     cold
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform 0.12;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/RASProperties
deleted file mode 100644
index be86bc1ef..000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/RASProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kOmegaSST;
-
-turbulence          on;
-
-printCoeffs         on;
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties
new file mode 100644
index 000000000..beee8bdf0
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes
index 5e55527b8..d2738ff36 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,k)      bounded Gauss limitedLinear 0.2;
     div(phi,epsilon) bounded Gauss limitedLinear 0.2;
     div(phi,omega) bounded Gauss limitedLinear 0.2;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon
index 312afc24a..a0fa682a6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     floor
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     ceiling
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     fixedWalls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k
index 2b618db2f..0ca172de8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     floor
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     ceiling
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     fixedWalls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut
similarity index 83%
rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/mut
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut
index 504bd304c..86ee5ac89 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     floor
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
similarity index 90%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
index 34805a0b2..15d9319a4 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        LaunderSharmaKE;
+RAS
+{
+    RASModel        kEpsilon;
 
-turbulence      on;
+    turbulence      on;
 
-printCoeffs     on;
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
index 2ceace5b7..293a173b1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,h)      bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon
index b8e91addc..c49b1005e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     box
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     floor
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     ceiling
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -47,7 +47,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k
index 2b618db2f..0ca172de8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     floor
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     ceiling
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     fixedWalls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut
similarity index 86%
rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/mut
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut
index 93c6dc22b..a7fc155fc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     box
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     floor
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     ceiling
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -47,7 +47,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
similarity index 90%
rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/RASProperties
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
index a4937b503..15d9319a4 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/RASProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kEpsilon;
+RAS
+{
+    RASModel        kEpsilon;
 
-turbulence      on;
+    turbulence      on;
 
-printCoeffs     on;
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
index e0a0f4efd..1abd80550 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,k)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
     div(Ji,Ii_h)    bounded Gauss linearUpwind grad(Ii_h);
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
index c09d9c59c..f8b893353 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
@@ -34,32 +34,32 @@ boundaryField
     }
     minY
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     minZ
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     maxZ
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     bottomWater_to_rightSolid
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     bottomWater_to_leftSolid
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
     bottomWater_to_heater
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.01;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
index 556c0d3d9..2558d1e2e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
@@ -34,32 +34,32 @@ boundaryField
     }
     minY
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     minZ
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     maxZ
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     bottomWater_to_rightSolid
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     bottomWater_to_leftSolid
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
     bottomWater_to_heater
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.1;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index 070546bfc..bf6e7f748 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -12,7 +12,7 @@ runApplication splitMeshRegions -cellZones -overwrite
 # remove fluid fields from solid regions (important for post-processing)
 for i in heater leftSolid rightSolid
 do
-   rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh}
+   rm -f 0*/$i/{nut,alphat,epsilon,k,U,p_rgh}
 done
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
index dad0abea1..63a08c87a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -97,7 +97,7 @@ dictionaryReplacement
 
             ".*"
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.01;
             }
         }
@@ -123,7 +123,7 @@ dictionaryReplacement
 
             ".*"
             {
-                type            compressible::kqRWallFunction;
+                type            kqRWallFunction;
                 value           uniform 0.1;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
index 3051d55b0..1278f2856 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index 77bc57943..32b54e823 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libcompressibleTurbulenceModel.so"
-    "libcompressibleRASModels.so"
-);
-
 application     chtMultiRegionFoam;
 
 startFrom       latestTime;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index fef7666e7..ae6e8d8c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -83,7 +83,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.01;
             }
 
@@ -109,7 +109,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::kqRWallFunction;
+                type            kqRWallFunction;
                 value           uniform 0.1;
             }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index f00ffc591..1b68a368e 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -16,7 +16,7 @@ runApplication splitMeshRegions -cellZones -overwrite
 # remove fluid fields from solid regions (important for post-processing)
 for i in heater leftSolid rightSolid
 do
-   rm -f 0*/$i/{mut,alphat,epsilon,k,U,p_rgh}
+   rm -f 0*/$i/{nut,alphat,epsilon,k,U,p_rgh}
 done
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
deleted file mode 100644
index 09a9a5585..000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel laminar;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
deleted file mode 120000
index eaf002d2e..000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/RASProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index caff66645..b7bddf908 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -74,7 +74,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.01;
             }
         }
@@ -88,7 +88,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::kqRWallFunction;
+                type            kqRWallFunction;
                 value           uniform 0.1;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index dca5ba3f8..867b0a2e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index fef7666e7..ae6e8d8c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -83,7 +83,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.01;
             }
 
@@ -109,7 +109,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::kqRWallFunction;
+                type            kqRWallFunction;
                 value           uniform 0.1;
             }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat
new file mode 100644
index 000000000..40eeda22b
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0/air";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    blades
+    {
+        type            compressible::alphatWallFunction;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon
index 46cfcab3a..49dcfaa45 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           $internalField;
     }
     inlet
@@ -37,7 +37,7 @@ boundaryField
     }
     blades
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           $internalField;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k
index 6a2ab6f94..3f0421bdf 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           $internalField;
     }
     inlet
@@ -37,7 +37,7 @@ boundaryField
     }
     blades
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           $internalField;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut
new file mode 100644
index 000000000..63b9c797a
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0/air";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    blades
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/RASProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/RASProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/RASProperties
deleted file mode 100644
index 1cc42b8af..000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel laminar;
-
-turbulence      off;
-
-printCoeffs     off;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
index a39397c7c..52e15c826 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,K)      bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
index f787aa1bb..27a33bf7c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,K)      bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
index 6590684a5..9ce6c565d 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
@@ -12,7 +12,7 @@ runApplication splitMeshRegions -cellZones -overwrite
 # remove fluid fields from solid regions (important for post-processing)
 for i in heater leftSolid rightSolid
 do
-   rm -f 0*/$i/{rho,mut,alphat,epsilon,k,U,p_rgh,Qr,G,IDefault}
+   rm -f 0*/$i/{rho,nut,alphat,epsilon,k,U,p_rgh,Qr,G,IDefault}
 done
 
 for i in bottomAir topAir heater leftSolid rightSolid
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/RASProperties
deleted file mode 100644
index c6886ad28..000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/RASProperties
deleted file mode 120000
index eaf002d2e..000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/RASProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/RASProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index b115024cc..c583021fa 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -71,7 +71,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.01;
             }
         }
@@ -84,7 +84,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::kqRWallFunction;
+                type            kqRWallFunction;
                 value           uniform 0.1;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
index 127c9c965..f761dabb4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,R)      bounded Gauss upwind;
     div(R)          Gauss linear;
     div(Ji,Ii_h)    Gauss linearUpwind grad(U);
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index e62946373..68f73839a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -82,7 +82,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::epsilonWallFunction;
+                type            epsilonWallFunction;
                 value           uniform 0.01;
             }
 
@@ -107,7 +107,7 @@ dictionaryReplacement
         {
             ".*"
             {
-                type            compressible::kqRWallFunction;
+                type            kqRWallFunction;
                 value           uniform 0.1;
             }
 
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/RASProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary
index 0ffa7ce34..921d19779 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary
@@ -20,6 +20,7 @@ FoamFile
     rotor
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          144;
         startFace       5640;
     }
@@ -32,12 +33,14 @@ FoamFile
     front
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          2880;
         startFace       5880;
     }
     back
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          2880;
         startFace       8760;
     }
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
index e7fa28c74..381b548ef 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
index d93000913..4a2232f73 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,Urel)   Gauss limitedLinearV 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(Urel))))) Gauss linear;
+    div((nuEff*dev2(T(grad(Urel))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/RASProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/RASProperties
deleted file mode 100644
index e0e6b776a..000000000
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
new file mode 100644
index 000000000..85d399a1e
--- /dev/null
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
index c6d44d3c2..e5ff26a90 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      bounded Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) bounded Gauss upwind;
-    div((nuEff*dev(T(grad(Urel))))) Gauss linear;
+    div((nuEff*dev2(T(grad(Urel))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/turbulenceProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/turbulenceProperties
new file mode 100644
index 000000000..85d399a1e
--- /dev/null
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/RASProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/RASProperties
deleted file mode 100644
index aed2ebec5..000000000
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
similarity index 90%
rename from tutorials/combustion/engineFoam/kivaTest/constant/RASProperties
rename to tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
index a4937b503..15d9319a4 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kEpsilon;
+RAS
+{
+    RASModel        kEpsilon;
 
-turbulence      on;
+    turbulence      on;
 
-printCoeffs     on;
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
index de12e1d3a..06b08169d 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
@@ -32,10 +32,10 @@ divSchemes
     div(phi,U)      bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
     div(phi,epsilon) bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 
     div(-phi,Ua)    bounded Gauss upwind;
-    div((nuEff*dev(T(grad(Ua))))) Gauss linear;
+    div((nuEff*dev2(T(grad(Ua))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
deleted file mode 100644
index 34805a0b2..000000000
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        LaunderSharmaKE;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
new file mode 100644
index 000000000..8e24a9035
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        LaunderSharmaKE;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
index 815e25820..0fd54ce50 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,epsilon) bounded Gauss linear;
     div(phi,R)      bounded Gauss linear;
     div(phi,nuTilda) bounded Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
index 815e25820..0fd54ce50 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,epsilon) bounded Gauss linear;
     div(phi,R)      bounded Gauss linear;
     div(phi,nuTilda) bounded Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties
deleted file mode 100644
index b74bfe573..000000000
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon; // SpalartAllmaras;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
index ce1e571bf..36dca60f6 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,omega)  bounded Gauss linear;
     div(phi,R)      bounded Gauss linear;
     div(phi,nuTilda) bounded Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
index 83902138b..44da6880a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss linearUpwind grad(U);
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
index b7e6607f8..51be17c90 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/nuSgs b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut
similarity index 61%
rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/nuSgs
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut
index 77f51f798..55d04b421 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/nuSgs
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut
@@ -10,7 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      nuSgs;
+    location    "0";
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -23,25 +24,44 @@ boundaryField
     inlet
     {
         type            fixedValue;
-        value           uniform 0;
+        value           $internalField;
     }
-
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
-
     walls
     {
-        type            zeroGradient;
+        type            nutkWallFunction;
+        value           $internalField;
     }
-
     defaultFaces
     {
         type            empty;
     }
+    ACMI1_blockage
+    {
+        type            nutkWallFunction;
+        value           $internalField;
+    }
+    ACMI1_couple
+    {
+        type            cyclicACMI;
+        value           $internalField;
+    }
+    ACMI2_blockage
+    {
+        type            nutkWallFunction;
+        value           $internalField;
+    }
+    ACMI2_couple
+    {
+        type            cyclicACMI;
+        value           $internalField;
+    }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
index b6ae74a4e..f65b5bf39 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind grad(U);
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict
index 264b5c1c1..57b261e48 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
-
 application     pimpleDyMFoam;
 
 startFrom       startTime;
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
index b6ae74a4e..f65b5bf39 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind grad(U);
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/RASProperties
deleted file mode 100644
index e0e6b776a..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties
index 3721a46a2..02fa2df1b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
index 5f9910228..82d5997ca 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind grad(U);
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,omega)  Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/RASProperties
deleted file mode 100644
index e0e6b776a..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
new file mode 100644
index 000000000..af8a54be2
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
index 370aa5a66..da2c979ea 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      bounded Gauss linearUpwind grad(U);
     div(phi,k)      bounded Gauss upwind;
     div(phi,omega)  bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
index 14f066ebe..f8bab393c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,K)      Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/RASProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pimpleFoam/TJunction/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
index e7fa28c74..381b548ef 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
index e35188318..8495249e2 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
@@ -15,13 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libOpenFOAM.so"
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
-
 application     pimpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
index a59b75bee..ff07884de 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/RASProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
index e7fa28c74..381b548ef 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
index 0cbeb15c6..929e6a503 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
@@ -48,12 +48,6 @@ adjustTimeStep  yes;
 
 maxCo           3;
 
-libs
-(
-    "libOpenFOAM.so"
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
 
 functions
 {
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
index a59b75bee..ff07884de 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/nuSgs b/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
similarity index 98%
rename from tutorials/incompressible/pimpleFoam/channel395/0.org/nuSgs
rename to tutorials/incompressible/pimpleFoam/channel395/0.org/nut
index b4ba303bf..df3efc151 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/nuSgs
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "1";
-    object      nuSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0/nuSgs.gz b/tutorials/incompressible/pimpleFoam/channel395/0/nuSgs.gz
deleted file mode 100644
index 7c05e74de9f71cf1d5853ab5496bae46aa9d785d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208201
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%0AqR>nqYPq1k-Hhdo$5g7RfmWy#F1@
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
LWzm!E%jgOK0m{qF

diff --git a/tutorials/incompressible/pimpleFoam/channel395/Allrun b/tutorials/incompressible/pimpleFoam/channel395/Allrun
index 436a3b7ae..a94c6e72a 100755
--- a/tutorials/incompressible/pimpleFoam/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395/Allrun
@@ -14,7 +14,7 @@ runApplication blockMesh
 
 #- Run parallel
 runApplication decomposePar -cellDist
-runParallel $application 5
+runParallel $application 4
 runApplication reconstructPar
 
 runApplication postChannel
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/LESProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/LESProperties
deleted file mode 100644
index af3a82dbe..000000000
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/LESProperties
+++ /dev/null
@@ -1,86 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-printCoeffs     on;
-
-delta           vanDriest;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
index 2d60fc8bf..b04390b6e 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
@@ -15,6 +15,79 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType LESModel;
+simulationType LES;
+
+LES
+{
+    LESModel        SpalartAllmarasDDES; //kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           vanDriest;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
index 9f0365f2d..d4b2c3d0a 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains  5;
+numberOfSubdomains  4;
 
 //- Keep owner and neighbour on same processor for faces in zones:
 // preserveFaceZones (heater solid1 solid3);
@@ -38,9 +38,9 @@ numberOfSubdomains  5;
 //  for a balanced number of particles in a lagrangian simulation.
 // weightField dsmcRhoNMean;
 
-method          scotch;
-//method          hierarchical;
-// method          simple;
+// method          scotch;
+// method          hierarchical;
+method          simple;
 // method          metis;
 // method          manual;
 // method          multiLevel;
@@ -73,7 +73,7 @@ multiLevelCoeffs
 
 simpleCoeffs
 {
-    n           (2 1 1);
+    n           (1 2 2);
     delta       0.001;
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes b/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
index 6d5ef5ab9..8973a7c1c 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(B)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -57,5 +57,10 @@ fluxRequired
     p               ;
 }
 
+wallDist
+{
+    method meshWave;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
index 3beda0be2..b3abd8eaf 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
@@ -39,7 +39,7 @@ solvers
         relTol          0;
     }
 
-    "(U|k)"
+    "(U|k|nuTilda)"
     {
         solver          smoothSolver;
         smoother        symGaussSeidel;
@@ -47,7 +47,7 @@ solvers
         relTol          0.1;
     }
 
-    "(U|k)Final"
+    "(U|k|nuTilda)Final"
     {
         $U;
         tolerance       1e-05;
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/RASProperties b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/RASProperties
deleted file mode 100644
index 88b1e501a..000000000
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kkLOmega;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
index e7fa28c74..d6c092654 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kkLOmega;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
index ea3c1491e..0adb77555 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/RASProperties b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary
index 43b78ef41..581ceffc7 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary
@@ -32,12 +32,14 @@ FoamFile
     upperWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          223;
         startFace       24257;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          250;
         startFace       24480;
     }
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
index e7fa28c74..d5016f6d2 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
@@ -15,6 +15,15 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
index 926d489aa..e72eaed33 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      bounded Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
index 4cbfb18b0..769a0e506 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun
@@ -3,20 +3,14 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-
 # Set-up the LES case
 cp ../lesFiles/fvS* ../lesFiles/controlDict system/
-cp ../lesFiles/LESProperties ../lesFiles/turbulenceProperties constant/
+cp ../lesFiles/turbulenceProperties constant/
 
 ls -d processor* | xargs -i rm -rf ./{}/0 $1
 ls -d processor* | xargs -i mv ./{}/500 ./{}/0 $1
 ls -d processor* | xargs -i rm -rf ./{}/0/uniform $1
 
-ls -d processor* | xargs -i cp ../lesFiles/LESProperties ./{}/constant/ $1
-ls -d processor* | xargs -i cp ../lesFiles/turbulenceProperties ./{}/constant/ $1
-ls -d processor* | xargs -i cp ../lesFiles/nuSgs ./{}/0/ $1
-
-
 runParallel pisoFoam 8
 
 runApplication reconstructParMesh -constant -mergeTol 1e-6
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/LESProperties b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/LESProperties
deleted file mode 100644
index 197e16d12..000000000
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/LESProperties
+++ /dev/null
@@ -1,79 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel            SpalartAllmarasDDES;
-
-delta               cubeRootVol;
-
-printCoeffs         on;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-        maxDeltaRatio   1.1;
-    }
-    Cdelta           0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-        maxDeltaRatio   1.1;
-    }
-    Aplus            26;
-    Cdelta           0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
index 3972a7e78..2c7ad38af 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
@@ -36,11 +36,10 @@ divSchemes
     default         none;
 
     div(phi,U)      Gauss LUST unlimitedGrad(U);
-    //div(phi,U)      Gauss linearUpwind unlimitedGrad(U);
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
 
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
index 19904d0a3..ea00426f6 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
@@ -20,7 +20,7 @@ solvers
     {
         solver          GAMG;
         tolerance       1e-6;
-        relTol          0.1;
+        relTol          0.05;
 
         smoother        GaussSeidel;
         nPreSweeps      0;
@@ -28,7 +28,7 @@ solvers
 
         cacheAgglomeration true;
 
-        nCellsInCoarsestLevel 50;//10;
+        nCellsInCoarsestLevel 50;
         agglomerator    faceAreaPair;
         mergeLevels     1;
     };
@@ -36,23 +36,22 @@ solvers
     pFinal
     {
         $p;
-        tolerance       1e-6;
         relTol          0;
     };
 
     "(U|k|B|nuTilda)"
     {
         solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-07;
+        smoother        symGaussSeidel;
+        tolerance       1e-7;
         relTol          0;
     };
 }
 
 PISO
 {
-    nCorrectors     2;
-    nNonOrthogonalCorrectors 1;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
 }
 
 relaxationFactors
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/nuSgs b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/nuSgs
deleted file mode 100644
index bcc0d1104..000000000
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/nuSgs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      nuSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -1 0 0 0 0];
-
-internalField   uniform 0.0544766;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.0544766;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.0544766;
-        value           uniform 0.0544766;
-    }
-
-    front
-    {
-        type           symmetryPlane;
-    }
-
-    back
-    {
-        type           symmetryPlane;
-    }
-
-    lowerWall
-    {
-        type            nutUSpaldingWallFunction;
-        value           uniform 0.0544766;
-    }
-
-    upperWall
-    {
-        type           symmetryPlane;
-    }
-
-    "motorBike_.*"
-    {
-        type            nutUSpaldingWallFunction;
-        value           uniform 0.0544766;
-    }
-
-    "proc.*"
-    {
-        type            processor;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
index ab998a16d..35b21043f 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
@@ -15,6 +15,72 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+
+    delta               cubeRootVol;
+
+    printCoeffs         on;
+
+    turbulence          on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+            maxDeltaRatio   1.1;
+        }
+        Cdelta           0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+            maxDeltaRatio   1.1;
+        }
+        Aplus            26;
+        Cdelta           0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/RASProperties b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/RASProperties
deleted file mode 100644
index d76eff61b..000000000
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        SpalartAllmaras;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary
index 578783eae..7e7cb8fc3 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary
@@ -15,441 +15,47 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-72
+6
 (
-    frontAndBack
+    front
     {
         type            symmetryPlane;
         inGroups        1(symmetryPlane);
-        nFaces          320;
-        startFace       9440280;
+        nFaces          160;
+        startFace       3456;
+    }
+    back
+    {
+        type            symmetryPlane;
+        inGroups        1(symmetryPlane);
+        nFaces          160;
+        startFace       3616;
     }
     inlet
     {
         type            patch;
         nFaces          64;
-        startFace       9440600;
+        startFace       3776;
     }
     outlet
     {
         type            patch;
         nFaces          64;
-        startFace       9440664;
+        startFace       3840;
     }
     lowerWall
     {
         type            wall;
-        nFaces          15243;
-        startFace       9440728;
+        inGroups        1(wall);
+        nFaces          160;
+        startFace       3904;
     }
     upperWall
     {
         type            symmetryPlane;
         inGroups        1(symmetryPlane);
         nFaces          160;
-        startFace       9455971;
-    }
-    motorBike_frt-fairing:001%1
-    {
-        type            wall;
-        nFaces          90875;
-        startFace       9456131;
-    }
-    motorBike_windshield:002%2
-    {
-        type            wall;
-        nFaces          376;
-        startFace       9547006;
-    }
-    motorBike_rr-wh-rim:005%5
-    {
-        type            wall;
-        nFaces          2402;
-        startFace       9547382;
-    }
-    motorBike_rr-wh-rim:010%10
-    {
-        type            wall;
-        nFaces          5288;
-        startFace       9549784;
-    }
-    motorBike_fr-wh-rim:011%11
-    {
-        type            wall;
-        nFaces          7215;
-        startFace       9555072;
-    }
-    motorBike_fr-wh-brake-disk:012%12
-    {
-        type            wall;
-        nFaces          973;
-        startFace       9562287;
-    }
-    motorBike_frame:016-shadow%13
-    {
-        type            wall;
-        nFaces          1718;
-        startFace       9563260;
-    }
-    motorBike_rear-susp:014%14
-    {
-        type            wall;
-        nFaces          14936;
-        startFace       9564978;
-    }
-    motorBike_rear-susp:014-shadow%15
-    {
-        type            wall;
-        nFaces          8564;
-        startFace       9579914;
-    }
-    motorBike_frame:016%16
-    {
-        type            wall;
-        nFaces          969;
-        startFace       9588478;
-    }
-    motorBike_rr-wh-rim:005-shadow%17
-    {
-        type            wall;
-        nFaces          1251;
-        startFace       9589447;
-    }
-    motorBike_rr-wh-chain-hub:022%22
-    {
-        type            wall;
-        nFaces          1827;
-        startFace       9590698;
-    }
-    motorBike_rearseat%24
-    {
-        type            wall;
-        nFaces          3241;
-        startFace       9592525;
-    }
-    motorBike_frt-fairing%25
-    {
-        type            wall;
-        nFaces          5078;
-        startFace       9595766;
-    }
-    motorBike_windshield%26
-    {
-        type            wall;
-        nFaces          6545;
-        startFace       9600844;
-    }
-    motorBike_headlights%27
-    {
-        type            wall;
-        nFaces          455;
-        startFace       9607389;
-    }
-    motorBike_driversseat%28
-    {
-        type            wall;
-        nFaces          5112;
-        startFace       9607844;
-    }
-    motorBike_rear-body%29
-    {
-        type            wall;
-        nFaces          12033;
-        startFace       9612956;
-    }
-    motorBike_fuel-tank%30
-    {
-        type            wall;
-        nFaces          6586;
-        startFace       9624989;
-    }
-    motorBike_exhaust%31
-    {
-        type            wall;
-        nFaces          20319;
-        startFace       9631575;
-    }
-    motorBike_rr-wh-rim%32
-    {
-        type            wall;
-        nFaces          9928;
-        startFace       9651894;
-    }
-    motorBike_fr-mud-guard%33
-    {
-        type            wall;
-        nFaces          13989;
-        startFace       9661822;
-    }
-    motorBike_fr-wh-rim%34
-    {
-        type            wall;
-        nFaces          6592;
-        startFace       9675811;
-    }
-    motorBike_fr-wh-brake-disk%35
-    {
-        type            wall;
-        nFaces          7374;
-        startFace       9682403;
-    }
-    motorBike_fr-brake-caliper%36
-    {
-        type            wall;
-        nFaces          2178;
-        startFace       9689777;
-    }
-    motorBike_fr-wh-tyre%37
-    {
-        type            wall;
-        nFaces          9947;
-        startFace       9691955;
-    }
-    motorBike_hbars%38
-    {
-        type            wall;
-        nFaces          7345;
-        startFace       9701902;
-    }
-    motorBike_fr-forks%39
-    {
-        type            wall;
-        nFaces          10349;
-        startFace       9709247;
-    }
-    motorBike_chain%40
-    {
-        type            wall;
-        nFaces          7168;
-        startFace       9719596;
-    }
-    motorBike_rr-wh-tyre%41
-    {
-        type            wall;
-        nFaces          7245;
-        startFace       9726764;
-    }
-    motorBike_square-dial%42
-    {
-        type            wall;
-        nFaces          62;
-        startFace       9734009;
-    }
-    motorBike_round-dial%43
-    {
-        type            wall;
-        nFaces          183;
-        startFace       9734071;
-    }
-    motorBike_dial-holder%44
-    {
-        type            wall;
-        nFaces          1336;
-        startFace       9734254;
-    }
-    motorBike_rear-susp%45
-    {
-        type            wall;
-        nFaces          25738;
-        startFace       9735590;
-    }
-    motorBike_rear-brake-lights%46
-    {
-        type            wall;
-        nFaces          860;
-        startFace       9761328;
-    }
-    motorBike_rear-light-bracket%47
-    {
-        type            wall;
-        nFaces          2003;
-        startFace       9762188;
-    }
-    motorBike_frame%48
-    {
-        type            wall;
-        nFaces          20232;
-        startFace       9764191;
-    }
-    motorBike_rear-mud-guard%49
-    {
-        type            wall;
-        nFaces          10690;
-        startFace       9784423;
-    }
-    motorBike_rear-susp-spring-damp%50
-    {
-        type            wall;
-        nFaces          1769;
-        startFace       9795113;
-    }
-    motorBike_fairing-inner-plate%51
-    {
-        type            wall;
-        nFaces          4660;
-        startFace       9796882;
-    }
-    motorBike_clutch-housing%52
-    {
-        type            wall;
-        nFaces          8237;
-        startFace       9801542;
-    }
-    motorBike_radiator%53
-    {
-        type            wall;
-        nFaces          1849;
-        startFace       9809779;
-    }
-    motorBike_water-pipe%54
-    {
-        type            wall;
-        nFaces          1182;
-        startFace       9811628;
-    }
-    motorBike_water-pump%55
-    {
-        type            wall;
-        nFaces          902;
-        startFace       9812810;
-    }
-    motorBike_engine%56
-    {
-        type            wall;
-        nFaces          19087;
-        startFace       9813712;
-    }
-    motorBike_rear-shock-link%57
-    {
-        type            wall;
-        nFaces          512;
-        startFace       9832799;
-    }
-    motorBike_rear-brake-fluid-pot-bracket%58
-    {
-        type            wall;
-        nFaces          721;
-        startFace       9833311;
-    }
-    motorBike_rear-brake-fluid-pot%59
-    {
-        type            wall;
-        nFaces          795;
-        startFace       9834032;
-    }
-    motorBike_footpeg%60
-    {
-        type            wall;
-        nFaces          1405;
-        startFace       9834827;
-    }
-    motorBike_rr-wh-chain-hub%61
-    {
-        type            wall;
-        nFaces          1984;
-        startFace       9836232;
-    }
-    motorBike_rear-brake-caliper%62
-    {
-        type            wall;
-        nFaces          2119;
-        startFace       9838216;
-    }
-    motorBike_rider-helmet%65
-    {
-        type            wall;
-        nFaces          2244;
-        startFace       9840335;
-    }
-    motorBike_rider-visor%66
-    {
-        type            wall;
-        nFaces          171;
-        startFace       9842579;
-    }
-    motorBike_rider-boots%67
-    {
-        type            wall;
-        nFaces          5287;
-        startFace       9842750;
-    }
-    motorBike_rider-gloves%68
-    {
-        type            wall;
-        nFaces          3129;
-        startFace       9848037;
-    }
-    motorBike_rider-body%69
-    {
-        type            wall;
-        nFaces          22909;
-        startFace       9851166;
-    }
-    motorBike_frame:0%70
-    {
-        type            wall;
-        nFaces          361;
-        startFace       9874075;
-    }
-    motorBike_frt-fairing:001-shadow%74
-    {
-        type            wall;
-        nFaces          56996;
-        startFace       9874436;
-    }
-    motorBike_windshield-shadow%75
-    {
-        type            wall;
-        nFaces          4535;
-        startFace       9931432;
-    }
-    motorBike_fr-mud-guard-shadow%81
-    {
-        type            wall;
-        nFaces          9174;
-        startFace       9935967;
-    }
-    motorBike_fr-wh-brake-disk-shadow%83
-    {
-        type            wall;
-        nFaces          3923;
-        startFace       9945141;
-    }
-    motorBike_rear-mud-guard-shadow%84
-    {
-        type            wall;
-        nFaces          6792;
-        startFace       9949064;
-    }
-    motorBike_rear-susp-spring-damp-shadow%85
-    {
-        type            wall;
-        nFaces          1211;
-        startFace       9955856;
-    }
-    motorBike_radiator-shadow%86
-    {
-        type            wall;
-        nFaces          1080;
-        startFace       9957067;
-    }
-    motorBike_rear-shock-link-shadow%87
-    {
-        type            wall;
-        nFaces          357;
-        startFace       9958147;
-    }
-    motorBike_rear-brake-fluid-pot-bracket-shadow%88
-    {
-        type            wall;
-        nFaces          420;
-        startFace       9958504;
-    }
-    motorBike_rr-wh-chain-hub-shadow%89
-    {
-        type            wall;
-        nFaces          1071;
-        startFace       9958924;
+        startFace       4064;
     }
 )
 
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/RASProperties b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
similarity index 90%
rename from tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/RASProperties
rename to tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
index aed2ebec5..f9d4381ee 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/RASProperties
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
@@ -15,10 +15,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        kEpsilon;
+RAS
+{
+    RASModel        SpalartAllmaras;
 
-turbulence      on;
+    turbulence      on;
 
-printCoeffs     on;
+    printCoeffs     on;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
index 3bc772bfe..c6c8fbf6f 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,U)      bounded Gauss linearUpwindV grad(U);
     div(phi,k)      bounded Gauss upwind;
     div(phi,omega)  bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,nuTilda) bounded Gauss upwind;
 }
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
similarity index 98%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
index 608ec8c46..726b637f7 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      nuSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
deleted file mode 100644
index b0c6edf80..000000000
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
+++ /dev/null
@@ -1,86 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           cubeRootVol;
-
-printCoeffs     on;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
index ab998a16d..19b969557 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
@@ -15,6 +15,78 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel        kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           cubeRootVol;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
index 45cce4ef1..752f20f66 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
similarity index 95%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
rename to tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
index 65048d6cc..726b637f7 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      muSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/LESProperties
deleted file mode 100644
index b0c6edf80..000000000
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/LESProperties
+++ /dev/null
@@ -1,86 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           cubeRootVol;
-
-printCoeffs     on;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
index a925d3cc2..19b969557 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
@@ -15,7 +15,78 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
 
+LES
+{
+    LESModel        kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           cubeRootVol;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
index 62b8ad368..75f357060 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/omega b/tutorials/incompressible/pisoFoam/ras/cavity/0/omega
new file mode 100644
index 000000000..a7040dd84
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/omega
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      omega;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 -1 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    movingWall
+    {
+        type            omegaWallFunction;
+        value           uniform 1;
+    }
+    fixedWalls
+    {
+        type            omegaWallFunction;
+        value           uniform 1;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
index 3721a46a2..3ffed52b9 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
@@ -15,7 +15,15 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
 
+RAS
+{
+    RASModel        kOmega;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
index a59b75bee..9d066714d 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
@@ -31,10 +31,11 @@ divSchemes
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
+    div(phi,omega)  Gauss limitedLinear 1;
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
index 983e6dd80..7342e01eb 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
@@ -38,7 +38,7 @@ solvers
         relTol          0;
     }
 
-    "(U|k|epsilon|R|nuTilda)"
+    "(U|k|epsilon|omega|R|nuTilda)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/RASProperties b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
index 3721a46a2..d587253c9 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
@@ -15,7 +15,15 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
 
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
index a59b75bee..ff07884de 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
index 5db0abc18..930ef501a 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     default         none;
 
     div(phi,U)      bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
 }
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
index 9376d2300..ee3301aea 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     default         none;
 
     div(phi,U)      bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
 }
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/RASProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
index 9376d2300..ee3301aea 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     default         none;
 
     div(phi,U)      bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,k)      bounded Gauss upwind;
 }
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties
deleted file mode 100644
index d76eff61b..000000000
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        SpalartAllmaras;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
new file mode 100644
index 000000000..2c4a27454
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        SpalartAllmaras;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
index 4158d2dea..38d944924 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     default         none;
     div(phi,U)      bounded Gauss linearUpwind grad(U);
     div(phi,nuTilda) bounded Gauss linearUpwind grad(nuTilda);
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/RASProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
new file mode 100644
index 000000000..a9b58dc78
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
index dddcf6c24..6a50ad98d 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,U)      bounded Gauss limitedLinearV 1;
     div(phi,k)      bounded Gauss limitedLinear 1;
     div(phi,epsilon) bounded Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
deleted file mode 100644
index 3b7dcacf8..000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kOmegaSST;
-
-turbulence          on;
-
-printCoeffs         on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
new file mode 100644
index 000000000..f1719c6a0
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
@@ -0,0 +1,26 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 553c603b4..c7607fc23 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -14,13 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libOpenFOAM.so"
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
-
 application     simpleFoam;
 
 startFrom       latestTime;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 065507c3f..cf8155eea 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,U)      bounded Gauss linearUpwindV grad(U);
     div(phi,k)      bounded Gauss upwind;
     div(phi,omega)  bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/RASProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/RASProperties
deleted file mode 100644
index 63ed5a5ef..000000000
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        realizableKE;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
index e7fa28c74..45b095b54 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
@@ -15,6 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+RAS
+{
+    RASModel        realizableKE;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
index da248aeec..e43cefc79 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
@@ -15,13 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libOpenFOAM.so"
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
-
 application     simpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
index eb56b2a74..eff3e37ae 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      bounded Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) bounded Gauss limitedLinear 1;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
new file mode 100644
index 000000000..59a2e7e20
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
index 821adc7eb..268cde63e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      bounded Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
new file mode 100644
index 000000000..a9b58dc78
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
index 821adc7eb..268cde63e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      bounded Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/RASProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
similarity index 58%
rename from tutorials/incompressible/simpleFoam/turbineSiting/constant/RASProperties
rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
index e8f2fd502..1385aff11 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/RASProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
@@ -10,26 +10,31 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel            kEpsilon;
-
-turbulence          on;
-
-printCoeffs         on;
-
-kEpsilonCoeffs
+RAS
 {
-    Cmu         0.09;
-    C1          1.44;
-    C2          1.92;
-    sigmaEps    1.11; //Original value:1.44
-    //NOTE: See "On the use of the k-Epsilon model in commercial CFD software
-    // to model the neutral atmospheric boundary layer". J. of wind engineering
-    // and inductrial aerodymanics 95(2007) 355-269 by
-    // D.M. Hargreaves and N.G. Wright
+    RASModel            kEpsilon;
+
+    turbulence          on;
+
+    printCoeffs         on;
+
+    kEpsilonCoeffs
+    {
+        Cmu         0.09;
+        C1          1.44;
+        C2          1.92;
+        sigmaEps    1.11; //Original value:1.44
+        // See:
+        // D.M. Hargreaves and N.G. Wright
+        // "On the use of the k-Epsilon model in commercial CFD software
+        // to model the neutral atmospheric boundary layer",
+        // J. of wind engineering and industrial aerodymanics,
+        // 95(2007) 355-269
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
index 1b295b32a..f648f3ed7 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
@@ -14,8 +14,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs            ("libincompressibleRASModels.so");
-
 application     simpleFoam;
 
 startFrom       latestTime;
@@ -34,7 +32,7 @@ writeInterval   50;
 
 purgeWrite      0;
 
-writeFormat     binary; //ascii;
+writeFormat     binary;
 
 writePrecision  12;
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
index 492b79ef7..445a2f3bd 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
@@ -27,10 +27,12 @@ gradSchemes
 divSchemes
 {
     default             none;
+
     div(phi,U)          bounded Gauss upwind;
-    div((nuEff*dev(T(grad(U)))))    Gauss linear;
     div(phi,epsilon)    bounded Gauss upwind;
     div(phi,k)          bounded Gauss upwind;
+
+    div((nuEff*dev2(T(grad(U)))))    Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/mut b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/nut
similarity index 95%
rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/mut
rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/nut
index 47d65d567..7c1a3594d 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/mut
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/RASProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties
index c2c3b28a1..aefe0c27d 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties
@@ -17,5 +17,4 @@ FoamFile
 
 simulationType  laminar;
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
index 73cdf5dca..a3d785d31 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,epsilon) Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
 
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k
index 2a7693689..098b4a6eb 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k
@@ -48,7 +48,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/mut b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/nut
similarity index 93%
rename from tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/mut
rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/nut
index 7cfeaae13..41fe07482 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/mut
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -46,7 +46,7 @@ boundaryField
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
index c1aa352a7..462084a38 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
@@ -31,14 +31,14 @@ boundaryField
     }
     inletCentral
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
     }
     inletSides
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
@@ -50,7 +50,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k
index 2a7693689..098b4a6eb 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k
@@ -48,7 +48,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/mut b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/nut
similarity index 93%
rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/mut
rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/nut
index 7cfeaae13..41fe07482 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/mut
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -46,7 +46,7 @@ boundaryField
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
index c1aa352a7..462084a38 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
@@ -31,14 +31,14 @@ boundaryField
     }
     inletCentral
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
     }
     inletSides
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
@@ -50,7 +50,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/RASProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/RASProperties
deleted file mode 100644
index 568821b00..000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kOmegaSST; // kEpsilon;
-
-turbulence          on;
-
-printCoeffs         on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index aaccd5feb..89a95c3f0 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes
index 4bef25ebf..13bfbc31f 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,omega) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)   Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/RASProperties b/tutorials/lagrangian/MPPICFoam/column/constant/RASProperties
deleted file mode 100644
index cc1647b25..000000000
--- a/tutorials/lagrangian/MPPICFoam/column/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
index 9fcf588c0..5f62ec144 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 5390.5;
     }
     bottom
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 5390.5;
     }
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 5390.5;
     }
     symmetry
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
index d5f2de207..31facc9f6 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 37.5;
     }
     bottom
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 37.5;
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 37.5;
     }
     symmetry
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut
similarity index 86%
rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut
index 9622ffefd..718743bbc 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
deleted file mode 100644
index fede44f8c..000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     yes;
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
index 3721a46a2..c323d9397 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     yes;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
index 3bcfc65ff..dfc512358 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)   Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
deleted file mode 100644
index cc1647b25..000000000
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
index 3721a46a2..c2c3b28a1 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  laminar;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
deleted file mode 100644
index cc1647b25..000000000
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
index 3721a46a2..c2c3b28a1 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  laminar;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
index 560f65db1..f073a5ff5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)  Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon
index b4d9f6fdb..e73cabb04 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon
@@ -23,12 +23,12 @@ boundaryField
 {
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 1e-7;
     }
     wallFilm
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 1e-7;
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k
index 9036004c5..01d40325b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k
@@ -23,12 +23,12 @@ boundaryField
 {
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1e-5;
     }
     wallFilm
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1e-5;
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/mut b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut
similarity index 88%
rename from tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/mut
rename to tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut
index c0cf6eed6..e985d6e5f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/mut
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 1e-7;
 
@@ -23,12 +23,12 @@ boundaryField
 {
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     wallFilm
     {
-        type            mutkFilmWallFunction;
+        type            nutkFilmWallFunction;
         B               5.5;
         yPlusCrit       11.05;
         value           uniform 0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/RASProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/RASProperties
deleted file mode 100644
index 85d8b8af8..000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     no;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties
index fcb13c355..eeaaa9205 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel; // laminar;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     no;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
index 9097048a7..b7b5130a7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
@@ -46,7 +46,7 @@ dictionaryReplacement
         }
     }
 
-    "mut"
+    "nut"
     {
         boundaryField
         {
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
index 906c819b4..cc232dbb0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)  Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
index 7cb276073..1885c5628 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)  Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
index 906c819b4..cc232dbb0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)  Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
index 741efe7cc..448a7a085 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.0449;
     }
     inlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
index 99ad23a21..7d79256b2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.0938;
     }
     inlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/mut b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
similarity index 93%
rename from tutorials/lagrangian/reactingParcelFoam/filter/0.org/mut
rename to tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
index ed047925d..c0334a141 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/mut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "1";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [ 0 2 -1 0 0 0 0 ];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
index 741efe7cc..448a7a085 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 0.0449;
     }
     inlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/k b/tutorials/lagrangian/reactingParcelFoam/filter/0/k
index 99ad23a21..7d79256b2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/k
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0.0938;
     }
     inlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/mut b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
similarity index 93%
rename from tutorials/lagrangian/reactingParcelFoam/filter/0/mut
rename to tutorials/lagrangian/reactingParcelFoam/filter/0/nut
index ed047925d..c0334a141 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/mut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "1";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [ 0 2 -1 0 0 0 0 ];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/RASProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/RASProperties
deleted file mode 100644
index dffc9c2d5..000000000
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kEpsilon;
-
-turbulence          on;
-
-printCoeffs         on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
index aaccd5feb..2939a395e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel            kEpsilon;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
index 217e56ec6..908f3c60e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
@@ -96,7 +96,7 @@ dictionaryReplacement
             }
         }
     }
-    mut
+    nut
     {
         boundaryField
         {
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
index 66667655d..51019fc93 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
@@ -51,12 +51,5 @@ maxCo           1.0;
 
 maxDeltaT       1;
 
-libs
-(
-    "libOpenFOAM.so"
-    "libcompressibleTurbulenceModel.so"
-    "libcompressibleRASModels.so"
-    "libradiationModels.so"
-);
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
index cbdf8c0b4..536c43de0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)   Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
index e7d730d2f..890464255 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,omega) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)   Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k
index 2a7693689..098b4a6eb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k
@@ -48,7 +48,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/mut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut
similarity index 93%
rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/mut
rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut
index 7cfeaae13..41fe07482 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/mut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -46,7 +46,7 @@ boundaryField
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
index c1aa352a7..462084a38 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
@@ -31,14 +31,14 @@ boundaryField
     }
     inletCentral
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
     }
     inletSides
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
@@ -50,7 +50,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/RASProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/RASProperties
deleted file mode 100644
index 568821b00..000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kOmegaSST; // kEpsilon;
-
-turbulence          on;
-
-printCoeffs         on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
index aaccd5feb..89a95c3f0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
index d3296d433..fb6d354d1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,omega) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)   Gauss upwind;
 }
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k
index 2a7693689..098b4a6eb 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k
@@ -48,7 +48,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/mut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut
similarity index 93%
rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/mut
rename to tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut
index 7cfeaae13..41fe07482 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/mut
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut
@@ -11,11 +11,11 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -46,7 +46,7 @@ boundaryField
     }
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
index c1aa352a7..462084a38 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
@@ -31,14 +31,14 @@ boundaryField
     }
     inletCentral
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
     }
     inletSides
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
@@ -50,7 +50,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k
index 2a7693689..098b4a6eb 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k
@@ -48,7 +48,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/mut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/mut
deleted file mode 100644
index 7cfeaae13..000000000
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/mut
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      mut;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    inletSides
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    outlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    walls
-    {
-        type            mutkWallFunction;
-        Cmu             0.09;
-        kappa           0.41;
-        E               9.8;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut
new file mode 100644
index 000000000..41fe07482
--- /dev/null
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    back
+    {
+        type            symmetryPlane;
+    }
+    front
+    {
+        type            symmetryPlane;
+    }
+    inletCentral
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    inletSides
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
index c1aa352a7..462084a38 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
@@ -31,14 +31,14 @@ boundaryField
     }
     inletCentral
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
     }
     inletSides
     {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
+        type            turbulentMixingLengthFrequencyInlet;
         mixingLength    0.007;
         k               k;
         value           uniform 4.5e-3;
@@ -50,7 +50,7 @@ boundaryField
     }
     walls
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/RASProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/RASProperties
deleted file mode 100644
index 568821b00..000000000
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel            kOmegaSST; // kEpsilon;
-
-turbulence          on;
-
-printCoeffs         on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index aaccd5feb..87ceaddfd 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -14,7 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel            kOmegaSST; // kEpsilon;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
index d80f5e4e2..2091a6975 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,epsilon) bounded Gauss upwind;
     div(phi,omega) bounded Gauss upwind;
     div(phi,Yi_h)   Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
index e38ed0278..c14d3d7e0 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform 90;
     }
 }
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
index 6650fed2a..434499066 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform 1;
     }
 }
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/mut b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
similarity index 90%
rename from tutorials/lagrangian/sprayFoam/aachenBomb/0/mut
rename to tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
index ce6dfaf3e..455e74634 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/mut
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
@@ -11,11 +11,11 @@ FoamFile
     format      binary;
     class       volScalarField;
     location    "0";
-    object      mut;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            mutkWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/RASProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/RASProperties
deleted file mode 100644
index 648ca4453..000000000
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
index 85d799ea5..017f5dba9 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
index c4a6d627c..d064aca38 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(phi,Yi_h)   Gauss upwind;
 }
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/RASProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/RASProperties
deleted file mode 100644
index da54fd75a..000000000
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     off;
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
index e7fa28c74..d7309cb88 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     off;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
index 6ecda2783..59d9365ad 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(rhoPhi,K)  Gauss upwind;
     div(phi,k)  Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/RASProperties b/tutorials/multiphase/LTSInterFoam/DTCHull/constant/RASProperties
deleted file mode 100644
index e0e6b776a..000000000
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/LTSInterFoam/DTCHull/constant/turbulenceProperties
index 3721a46a2..02fa2df1b 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/turbulenceProperties
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSchemes b/tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSchemes
index 5dac71381..66a883a15 100644
--- a/tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSchemes
+++ b/tutorials/multiphase/LTSInterFoam/DTCHull/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss linearUpwind limitedGrad;
     div(phi,omega)  Gauss linearUpwind limitedGrad;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
similarity index 98%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
index 6d4b26abe..f56907e7b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      nuSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
deleted file mode 100644
index e6d3db2b5..000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           smooth;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
index a925d3cc2..ec7ce0246 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
@@ -15,7 +15,79 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel        kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           smooth;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
index 17346054f..9072b1b48 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,rho)    Gauss vanLeer;
     div(rhoPhi,U)   Gauss LUST grad(U);
     div(phi,k)      Gauss LUST grad(k);
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 gradSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut
similarity index 98%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut
index c4d32cf2f..f85002726 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      nuSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
deleted file mode 100644
index e6d3db2b5..000000000
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           smooth;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
index a925d3cc2..ec7ce0246 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
@@ -15,7 +15,79 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
+
+LES
+{
+    LESModel        kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           smooth;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
index 64aa6e54b..8753ef178 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,rho)    Gauss vanLeer;
     div(rhoPhi,U)   Gauss LUST grad(U);
     div(phi,k)      Gauss LUST grad(k);
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 gradSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
deleted file mode 100644
index e0e6b776a..000000000
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
index 3721a46a2..02fa2df1b 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index 618d1b4a9..0235d8bc0 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)   Gauss limitedLinearV 1;
     div(phi,omega)  Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 gradSchemes
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/RASProperties b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/RASProperties
deleted file mode 100644
index 4773e27a4..000000000
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
index 045d871d3..c64e1f810 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(rhoPhi,K)  Gauss linear;
     div((phi+meshPhi),p)  Gauss linear;
 
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/LESProperties
deleted file mode 100644
index b3cfc0ba0..000000000
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/LESProperties
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        laminar;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary
index 81845d8cb..85fa84fac 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary
@@ -20,6 +20,7 @@ FoamFile
     walls
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          480;
         startFace       25360;
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
index 273c37e72..990fea86e 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
@@ -38,7 +38,7 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(phi,k)      Gauss upwind;
 
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/LESProperties
deleted file mode 100644
index b3cfc0ba0..000000000
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/LESProperties
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        laminar;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
index 273c37e72..990fea86e 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
@@ -38,7 +38,7 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(phi,k)      Gauss upwind;
 
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 0fb6563e2..d32c57728 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(rhoPhi,T)  Gauss upwind;
     div(rhoPhi,K)  Gauss upwind;
     div(phi,p)      Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/RASProperties
deleted file mode 100644
index e0e6b776a..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
index 3721a46a2..02fa2df1b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
index 84b639311..44668611d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss linearUpwind limitedGrad;
     div(phi,omega)  Gauss linearUpwind limitedGrad;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties
deleted file mode 100644
index af7ecd49d..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     off;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
index 09c25018c..c2c3b28a1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar; //RASModel;
+simulationType  laminar;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
index 020384e5e..06de48abe 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,omega)  Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
index c2021e727..cd2daf822 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
index 88424a730..4749335ec 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/RASProperties
deleted file mode 100644
index da54fd75a..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     off;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
index e7fa28c74..d7309cb88 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
@@ -15,6 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     off;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
index bf1d065bc..59d9365ad 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
@@ -37,9 +37,7 @@ divSchemes
     div(rhoPhi,K)  Gauss upwind;
     div(phi,k)  Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
-
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties
deleted file mode 100644
index 4773e27a4..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
index e9bac3f71..a956c1938 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties
deleted file mode 100644
index 4773e27a4..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
index e9bac3f71..a956c1938 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties
deleted file mode 100644
index 4773e27a4..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
index e9bac3f71..a956c1938 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
index e9bac3f71..a956c1938 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties
deleted file mode 100644
index 4773e27a4..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
index e9bac3f71..a956c1938 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/RASProperties
deleted file mode 100644
index 4773e27a4..000000000
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
index e9bac3f71..a956c1938 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss vanLeer;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
index cdfd201c6..6f42b083e 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
index cdd6f1ed1..ba6f492d2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss linearUpwind grad(U);
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
index a90bcae2d..e4c518a24 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss linear;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
similarity index 98%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
index 95e02c374..7b34de6ad 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      nuSgs;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
deleted file mode 100644
index 720e13925..000000000
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
+++ /dev/null
@@ -1,86 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           smooth;
-
-printCoeffs     on;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
index a925d3cc2..b0b4dcee0 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
@@ -15,7 +15,78 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  LESModel;
+simulationType  LES;
 
+LES
+{
+    LESModel        kEqn;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    delta           smooth;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    PrandtlCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Cdelta          0.158;
+    }
+
+    vanDriestCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        smoothCoeffs
+        {
+            delta           cubeRootVol;
+            cubeRootVolCoeffs
+            {
+                deltaCoeff      1;
+            }
+
+            maxDeltaRatio   1.1;
+        }
+
+        Aplus           26;
+        Cdelta          0.158;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
index 07bd316e0..9510ee686 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(B)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
index 236e233b9..8b652373b 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-keepCases="damBreak damBreakPorousBaffle weirOverflow waterChannel"
+keepCases="damBreak damBreakPorousBaffle weirOverflow waterChannel angledDuct"
 loseCases="damBreakFine"
 
 for case in $keepCases
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/RASProperties b/tutorials/multiphase/interFoam/ras/angledDuct/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
index f44c0bc2a..749207137 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
index 1b4dbb60a..79ef3a79e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     leftWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4432;
     }
     rightWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4482;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          62;
         startFace       4532;
     }
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
index 3bc534759..960ff2562 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
index 6fe05fbb3..f24e6e1ed 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@@ -59,7 +59,7 @@ boundaryField
         jump            uniform 0;
         value           uniform 0;
         D               1000;
-        I               1000;
+        I               500;
         length          0.15;
     }
     porous_half1
@@ -68,7 +68,7 @@ boundaryField
         patchType       cyclic;
         value           uniform 0;
         D               1000;
-        I               1000;
+        I               500;
         length          0.15;
     }
 }
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/RASProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary
index 49282f81f..45396d407 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     leftWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4419;
     }
     rightWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4469;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          62;
         startFace       4519;
     }
@@ -51,7 +54,13 @@ FoamFile
     porous_half0
     {
         type            cyclic;
-        inGroups        1(cyclic);
+        inGroups
+2
+(
+cyclic
+cyclicFaces
+)
+;
         nFaces          13;
         startFace       9163;
         matchTolerance  0.0001;
@@ -61,7 +70,13 @@ FoamFile
     porous_half1
     {
         type            cyclic;
-        inGroups        1(cyclic);
+        inGroups
+2
+(
+cyclic
+cyclicFaces
+)
+;
         nFaces          13;
         startFace       9176;
         matchTolerance  0.0001;
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
index 53bb12ff9..f66e5d7c7 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
@@ -52,11 +52,5 @@ maxAlphaCo      0.1;
 
 maxDeltaT       1;
 
-libs
-(
-    "libturbulenceDerivedFvPatchFields.so"
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
index 3bc534759..960ff2562 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
index a05ac072d..22019100d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phirb,alpha) Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,omega)  Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
deleted file mode 100644
index 34da39d90..000000000
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
+++ /dev/null
@@ -1,24 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kOmegaSST;
-
-turbulence      on;
-
-printCoeffs     on;
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
index 3721a46a2..02fa2df1b 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kOmegaSST;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
index 8774b16c1..42584c41c 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phirb,alpha)    Gauss linear;
 
     "div\(phi,(k|omega)\)"      Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
index 40392f6f9..ba84fd84f 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
index 31b1e85b5..b0d1f73aa 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss limitedLinearV 1;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/RASProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
index 3721a46a2..cd2daf822 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
@@ -15,7 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
index a121b19dd..3ff478fa5 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs
-(
-    "libincompressibleTurbulenceModel.so"
-    "libincompressibleRASModels.so"
-);
-
 application     interPhaseChangeDyMFoam;
 
 startFrom       startTime;
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
index 663657c04..7f42a48fe 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,k)          Gauss upwind;
     div(phi,epsilon)    Gauss upwind;
 
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index 2c2507cfb..a61518f61 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,k)           Gauss linearUpwind grad(k);
     div(phi,alpha)       Gauss vanLeer;
     div(phirb,alpha)     Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 gradSchemes
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/LESProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/LESProperties
deleted file mode 100644
index ec20bc01d..000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/LESProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        laminar;
-
-printCoeffs     on;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
index bf47f6964..4564ccc46 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
@@ -32,6 +32,7 @@ FoamFile
     walls
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          150;
         startFace       3700;
     }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
similarity index 91%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties
rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
index 8107da2ca..c2c3b28a1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
@@ -11,13 +11,11 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel        laminar;
-
-turbulence      off;
+simulationType  laminar;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/LESProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/LESProperties
deleted file mode 100644
index ec20bc01d..000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/LESProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        laminar;
-
-printCoeffs     on;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary
index 1b4dbb60a..79ef3a79e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     leftWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4432;
     }
     rightWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4482;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          62;
         startFace       4532;
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/LESProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/LESProperties
deleted file mode 100644
index ec20bc01d..000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/LESProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        laminar;
-
-printCoeffs     on;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary
index a477fd3cb..f1ec54505 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     leftWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          195;
         startFace       68014;
     }
     rightWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          195;
         startFace       68209;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          206;
         startFace       68404;
     }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties
deleted file mode 100644
index ec20bc01d..000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        laminar;
-
-printCoeffs     on;
-
-delta           cubeRootVol;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
index 188a0f0c5..5c2a6cf99 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
@@ -20,12 +20,14 @@ FoamFile
     rotor
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          192;
         startFace       5952;
     }
     stator
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          192;
         startFace       6144;
     }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/RASProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
similarity index 89%
rename from tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/RASProperties
rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
index 09a9a5585..c2c3b28a1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/RASProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
@@ -10,15 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    location    "constant";
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel laminar;
-
-turbulence      on;
-
-printCoeffs     on;
+simulationType  laminar;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/RASProperties b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/RASProperties
deleted file mode 100644
index a4937b503..000000000
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        kEpsilon;
-
-turbulence      on;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes
index d640b56b8..2234c3afd 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)       Gauss limitedLinearV 1;
     div(phi,alpha)      Gauss vanLeer;
     div(phirb,alpha)    Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 69de4bdbc..f4c635c89 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)   Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
index 69de4bdbc..f4c635c89 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)   Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
index 9f1495f17..0844c2a1e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     div(rhoPhi,U)  Gauss limitedLinearV 1;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss linear;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
index 51db9cc49..a5bdba477 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
index 9ff435c16..4f34ad122 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
index 84a24f492..133816f9e 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(rhoPhi,U)  Gauss linear;
     div(phi,alpha)  Gauss vanLeer;
     div(phi,k)      Gauss limitedLinear 1;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes