From 24c4b1b74506cb6fe0d2bdf568ad694570e2f69e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Jun 2008 10:48:04 +0100
Subject: [PATCH] relocation of turbulence models and renaming namespaces
---
.../solvers/combustion/PDRFoam/Make/options | 2 +-
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 35 +--
.../turbulence/PDRkEpsilon/PDRkEpsilon.H | 22 +-
.../solvers/combustion/XiFoam/Make/options | 2 +-
.../solvers/combustion/Xoodles/Make/options | 4 +-
.../combustion/coldEngineFoam/Make/options | 2 +-
.../combustion/dieselEngineFoam/Make/options | 2 +-
.../combustion/dieselFoam/Make/options | 2 +-
.../combustion/engineFoam/Make/options | 2 +-
.../combustion/reactingFoam/Make/options | 2 +-
.../solvers/compressible/coodles/Make/options | 4 +-
.../compressible/rhoPimpleFoam/Make/options | 2 +-
.../rhoPorousSimpleFoam/Make/options | 2 +-
.../compressible/rhoSimpleFoam/Make/options | 2 +-
.../compressible/rhoTurbFoam/Make/options | 2 +-
.../compressible/sonicTurbFoam/Make/options | 2 +-
...H~918dc24fd09dc58d05222b287f51b98d2599f83e | 14 ++
...918dc24fd09dc58d05222b287f51b98d2599f83e_0 | 14 ++
...918dc24fd09dc58d05222b287f51b98d2599f83e_1 | 14 ++
...H~918dc24fd09dc58d05222b287f51b98d2599f83e | 234 ++++++++++++++++++
...918dc24fd09dc58d05222b287f51b98d2599f83e_0 | 234 ++++++++++++++++++
...918dc24fd09dc58d05222b287f51b98d2599f83e_1 | 234 ++++++++++++++++++
...H~918dc24fd09dc58d05222b287f51b98d2599f83e | 18 ++
...918dc24fd09dc58d05222b287f51b98d2599f83e_0 | 18 ++
...918dc24fd09dc58d05222b287f51b98d2599f83e_1 | 18 ++
.../heatTransfer/buoyantFoam/Make/options | 2 +-
.../buoyantSimpleFoam/Make/options | 2 +-
.../buoyantSimpleRadiationFoam/Make/options | 2 +-
.../chtMultiRegionFoam/Make/options | 2 +-
.../coupleManager/coupleManager.H | 2 +-
.../coupleManager/coupleManagerI.H | 2 +-
.../heatTransfer/lesBuoyantFoam/Make/options | 4 +-
.../incompressible/boundaryFoam/Make/options | 2 +-
.../boundaryFoam/createFields.H | 4 +-
.../incompressible/channelOodles/Make/options | 4 +-
.../incompressible/oodles/Make/options | 4 +-
.../incompressible/simpleFoam/Make/options | 2 +-
.../incompressible/simpleFoam/createFields.H | 4 +-
.../incompressible/turbDyMFoam/Make/options | 2 +-
.../incompressible/turbDyMFoam/createFields.H | 4 +-
.../incompressible/turbFoam/Make/options | 2 +-
.../incompressible/turbFoam/createFields.H | 4 +-
.../compressibleLesInterFoam/Make/options | 4 +-
.../multiphase/interDyMFoam/Make/options | 4 +-
.../multiphase/interDyMFoam/createFields.H | 6 +-
.../interPhaseChangeFoam/Make/options | 4 +-
.../multiphase/lesCavitatingFoam/Make/options | 6 +-
.../devOneEqEddy/devOneEqEddy.C | 12 +-
.../devOneEqEddy/devOneEqEddy.H | 6 +-
.../multiphase/lesInterFoam/Make/options | 4 +-
.../multiphase/rasCavitatingFoam/Make/options | 2 +-
.../rasCavitatingFoam/createFields.H | 4 +-
.../multiphase/rasInterFoam/Make/options | 2 +-
.../multiphase/rasInterFoam/createFields.H | 4 +-
.../dataConversion/hashSetUnion.H | 53 ++++
.../dataConversion/hashTableUnion.H | 53 ++++
.../execFlowFunctionObjects/Make/options | 6 +-
.../execFlowFunctionObjects.C | 9 +-
.../stressField/stressComponents/Make/options | 2 +-
.../postProcessing/turbulence/R/Make/options | 2 +-
.../turbulence/R/createFields.H | 4 +-
.../createTurbulenceFields/Make/options | 2 +-
.../createTurbulenceFields/createFields.H | 4 +-
.../velocityField/Pe/Make/options | 6 +-
.../postProcessing/velocityField/Pe/Pe.C | 9 +-
.../wall/wallGradU/Make/options | 2 +-
.../wall/wallHeatFlux/Make/options | 2 +-
.../wall/wallShearStress/Make/options | 2 +-
.../wall/wallShearStress/createFields.H | 4 +-
.../postProcessing/wall/yPlusLES/Make/options | 4 +-
.../postProcessing/wall/yPlusRAS/Make/options | 2 +-
.../postProcessing/wall/yPlusRAS/yPlusRAS.C | 4 +-
src/Allwmake | 1 -
src/turbulenceModels/Allwmake | 4 +-
.../LES}/Allwmake | 0
.../LES}/LESdeltas/LESdelta/LESdelta.C | 0
.../LES}/LESdeltas/LESdelta/LESdelta.H | 0
.../LES}/LESdeltas/LESdelta/newDelta.C | 0
.../LES}/LESdeltas/Make/files | 0
.../LES}/LESdeltas/Make/options | 0
.../LESdeltas/PrandtlDelta/PrandtlDelta.C | 0
.../LESdeltas/PrandtlDelta/PrandtlDelta.H | 0
.../cubeRootVolDelta/cubeRootVolDelta.C | 0
.../cubeRootVolDelta/cubeRootVolDelta.H | 0
.../LES}/LESdeltas/smoothDelta/smoothDelta.C | 0
.../LES}/LESdeltas/smoothDelta/smoothDelta.H | 0
.../smoothDelta/smoothDeltaDeltaDataI.H | 0
.../LES}/LESfilters/LESfilter/LESfilter.C | 0
.../LES}/LESfilters/LESfilter/LESfilter.H | 0
.../LES}/LESfilters/LESfilter/newFilter.C | 0
.../LES}/LESfilters/Make/files | 0
.../LES}/LESfilters/Make/options | 0
.../anisotropicFilter/anisotropicFilter.C | 0
.../anisotropicFilter/anisotropicFilter.H | 0
.../LESfilters/laplaceFilter/laplaceFilter.C | 0
.../LESfilters/laplaceFilter/laplaceFilter.H | 0
.../LESfilters/simpleFilter/simpleFilter.C | 0
.../LESfilters/simpleFilter/simpleFilter.H | 0
.../DeardorffDiffStress/DeardorffDiffStress.C | 4 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 4 +-
.../compressible/GenEddyVisc/GenEddyVisc.C | 4 +-
.../compressible/GenEddyVisc/GenEddyVisc.H | 4 +-
.../compressible/GenSGSStress/GenSGSStress.C | 4 +-
.../compressible/GenSGSStress/GenSGSStress.H | 4 +-
.../LES}/compressible/LESmodel/LESmodel.C | 0
.../LES}/compressible/LESmodel/LESmodel.H | 0
.../LES}/compressible/LESmodel/newLESmodel.C | 0
.../LES}/compressible/Make/files | 0
.../LES}/compressible/Make/options | 4 +-
.../compressible/Smagorinsky/Smagorinsky.C | 4 +-
.../compressible/Smagorinsky/Smagorinsky.H | 4 +-
.../SpalartAllmaras/SpalartAllmaras.C | 4 +-
.../SpalartAllmaras/SpalartAllmaras.H | 4 +-
.../compressible/dynOneEqEddy/dynOneEqEddy.C | 4 +-
.../compressible/dynOneEqEddy/dynOneEqEddy.H | 4 +-
.../lowReOneEqEddy/lowReOneEqEddy.C | 4 +-
.../lowReOneEqEddy/lowReOneEqEddy.H | 4 +-
.../LES}/compressible/oneEqEddy/oneEqEddy.C | 4 +-
.../LES}/compressible/oneEqEddy/oneEqEddy.H | 4 +-
.../muSgsWallFunctionFvPatchScalarField.C | 4 +-
.../muSgsWallFunctionFvPatchScalarField.H | 4 +-
.../DeardorffDiffStress/DeardorffDiffStress.C | 16 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 4 +-
.../incompressible/GenEddyVisc/GenEddyVisc.C | 4 +-
.../incompressible/GenEddyVisc/GenEddyVisc.H | 4 +-
.../GenSGSStress/GenSGSStress.C | 4 +-
.../GenSGSStress/GenSGSStress.H | 4 +-
.../LES}/incompressible/LESmodel/LESmodel.C | 0
.../LES}/incompressible/LESmodel/LESmodel.H | 0
.../incompressible/LESmodel/newLESmodel.C | 0
.../LRRDiffStress/LRRDiffStress.C | 4 +-
.../LRRDiffStress/LRRDiffStress.H | 4 +-
.../LES}/incompressible/Make/files | 0
.../LES}/incompressible/Make/options | 6 +-
.../incompressible/Smagorinsky/Smagorinsky.C | 4 +-
.../incompressible/Smagorinsky/Smagorinsky.H | 4 +-
.../Smagorinsky2/Smagorinsky2.C | 4 +-
.../Smagorinsky2/Smagorinsky2.H | 4 +-
.../SpalartAllmaras/SpalartAllmaras.C | 4 +-
.../SpalartAllmaras/SpalartAllmaras.H | 4 +-
.../dynMixedSmagorinsky/dynMixedSmagorinsky.C | 4 +-
.../dynMixedSmagorinsky/dynMixedSmagorinsky.H | 4 +-
.../dynOneEqEddy/dynOneEqEddy.C | 4 +-
.../dynOneEqEddy/dynOneEqEddy.H | 4 +-
.../dynSmagorinsky/dynSmagorinsky.C | 4 +-
.../dynSmagorinsky/dynSmagorinsky.H | 4 +-
.../LES}/incompressible/laminar/laminar.C | 4 +-
.../LES}/incompressible/laminar/laminar.H | 4 +-
.../locDynOneEqEddy/locDynOneEqEddy.C | 4 +-
.../locDynOneEqEddy/locDynOneEqEddy.H | 4 +-
.../mixedSmagorinsky/mixedSmagorinsky.C | 4 +-
.../mixedSmagorinsky/mixedSmagorinsky.H | 4 +-
.../LES}/incompressible/oneEqEddy/oneEqEddy.C | 4 +-
.../LES}/incompressible/oneEqEddy/oneEqEddy.H | 4 +-
.../scaleSimilarity/scaleSimilarity.C | 4 +-
.../scaleSimilarity/scaleSimilarity.H | 4 +-
.../spectEddyVisc/spectEddyVisc.C | 4 +-
.../spectEddyVisc/spectEddyVisc.H | 4 +-
.../vanDriestDelta/vanDriestDelta.C | 4 +-
.../vanDriestDelta/vanDriestDelta.H | 4 +-
.../nuSgsWallFunctionFvPatchScalarField.C | 4 +-
.../nuSgsWallFunctionFvPatchScalarField.H | 4 +-
src/turbulenceModels/RAS/Allwmake | 5 +
.../{ => RAS}/compressible/LRR/LRR.C | 4 +-
.../{ => RAS}/compressible/LRR/LRR.H | 6 +-
.../LaunderGibsonRSTM/LaunderGibsonRSTM.C | 4 +-
.../LaunderGibsonRSTM/LaunderGibsonRSTM.H | 6 +-
.../LaunderSharmaKE/LaunderSharmaKE.C | 4 +-
.../LaunderSharmaKE/LaunderSharmaKE.H | 6 +-
.../compressible/LaunderSharmaKE/sourceFiles | 0
.../{ => RAS}/compressible/Make/files | 0
.../{ => RAS}/compressible/Make/options | 0
.../compressible/RNGkEpsilon/RNGkEpsilon.C | 4 +-
.../compressible/RNGkEpsilon/RNGkEpsilon.H | 6 +-
.../compressible/RNGkEpsilon/sourceFiles | 0
.../SpalartAllmaras/SpalartAllmaras.C | 4 +-
.../SpalartAllmaras/SpalartAllmaras.H | 6 +-
.../compressible/kEpsilon/kEpsilon.C | 4 +-
.../compressible/kEpsilon/kEpsilon.H | 6 +-
.../kOmegaSST/checkkOmegaPatchFieldTypes.H | 0
.../compressible/kOmegaSST/kOmegaSST.C | 4 +-
.../compressible/kOmegaSST/kOmegaSST.H | 6 +-
.../kOmegaSST/kOmegaWallFunctionsI.H | 0
.../kOmegaSST/kOmegaWallViscosityI.H | 0
.../compressible/kOmegaSST/wallOmegaI.H | 0
.../{ => RAS}/compressible/laminar/laminar.C | 4 +-
.../{ => RAS}/compressible/laminar/laminar.H | 6 +-
.../compressible/realizableKE/realizableKE.C | 4 +-
.../compressible/realizableKE/realizableKE.H | 6 +-
.../turbulenceModel/newTurbulenceModel.C | 0
.../turbulenceModel/turbulenceModel.C | 0
.../turbulenceModel/turbulenceModel.H | 4 +-
...ndardRoughWallFunctionFvPatchScalarField.C | 4 +-
...ndardRoughWallFunctionFvPatchScalarField.H | 6 +-
.../wallFunctions/wallDissipationI.H | 0
.../wallFunctions/wallFunctionsI.H | 0
.../wallFunctions/wallViscosityI.H | 0
.../{ => RAS}/incompressible/LRR/LRR.C | 7 +-
.../{ => RAS}/incompressible/LRR/LRR.H | 9 +-
.../LamBremhorstKE/LamBremhorstKE.C | 7 +-
.../LamBremhorstKE/LamBremhorstKE.H | 9 +-
.../LaunderGibsonRSTM/LaunderGibsonRSTM.C | 7 +-
.../LaunderGibsonRSTM/LaunderGibsonRSTM.H | 9 +-
.../LaunderSharmaKE/LaunderSharmaKE.C | 7 +-
.../LaunderSharmaKE/LaunderSharmaKE.H | 9 +-
.../incompressible/LienCubicKE/LienCubicKE.C | 7 +-
.../incompressible/LienCubicKE/LienCubicKE.H | 9 +-
.../LienCubicKELowRe/LienCubicKELowRe.C | 7 +-
.../LienCubicKELowRe/LienCubicKELowRe.H | 9 +-
.../LienCubicKELowReSetWallDissipation.H | 0
.../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 7 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.H | 9 +-
.../LienLeschzinerLowReSetWallDissipation.H | 0
.../{ => RAS}/incompressible/Make/files | 0
.../{ => RAS}/incompressible/Make/options | 0
.../NonlinearKEShih/NonlinearKEShih.C | 7 +-
.../NonlinearKEShih/NonlinearKEShih.H | 9 +-
.../{ => RAS}/incompressible/QZeta/QZeta.C | 7 +-
.../{ => RAS}/incompressible/QZeta/QZeta.H | 9 +-
.../incompressible/RNGkEpsilon/RNGkEpsilon.C | 7 +-
.../incompressible/RNGkEpsilon/RNGkEpsilon.H | 9 +-
.../SpalartAllmaras/SpalartAllmaras.C | 7 +-
.../SpalartAllmaras/SpalartAllmaras.H | 9 +-
.../incompressible/kEpsilon/kEpsilon.C | 7 +-
.../incompressible/kEpsilon/kEpsilon.H | 9 +-
.../kOmegaSST/checkkOmegaPatchFieldTypes.H | 0
.../incompressible/kOmegaSST/kOmegaSST.C | 7 +-
.../incompressible/kOmegaSST/kOmegaSST.H | 9 +-
.../kOmegaSST/kOmegaWallFunctionsI.H | 0
.../kOmegaSST/kOmegaWallViscosityI.H | 0
.../incompressible/kOmegaSST/wallOmegaI.H | 0
.../incompressible/laminar/laminar.C | 7 +-
.../incompressible/laminar/laminar.H | 9 +-
.../realizableKE/realizableKE.C | 7 +-
.../realizableKE/realizableKE.H | 9 +-
.../checkIncompressibleTurbulenceModelsLock.C | 0
.../turbulenceModel/newTurbulenceModel.C | 3 +
.../turbulenceModel/turbulenceModel.C | 3 +
.../turbulenceModel/turbulenceModel.H | 10 +-
.../wallFunctions/nonLinearWallFunctionsI.H | 0
...ndardRoughWallFunctionFvPatchScalarField.C | 19 +-
...ndardRoughWallFunctionFvPatchScalarField.H | 11 +-
...utStandardWallFunctionFvPatchScalarField.C | 13 +-
...utStandardWallFunctionFvPatchScalarField.H | 9 +-
.../nutWallFunctionFvPatchScalarField.C | 15 +-
.../nutWallFunctionFvPatchScalarField.H | 9 +-
.../wallFunctions/wallDissipationI.H | 0
.../wallFunctions/wallFunctionsI.H | 0
.../wallFunctions/wallNonlinearViscosityI.H | 0
.../wallFunctions/wallViscosityI.H | 0
250 files changed, 1444 insertions(+), 403 deletions(-)
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
create mode 100644 applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
create mode 100644 applications/utilities/postProcessing/dataConversion/hashSetUnion.H
create mode 100644 applications/utilities/postProcessing/dataConversion/hashTableUnion.H
rename src/{LESmodels => turbulenceModels/LES}/Allwmake (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/LESdelta/LESdelta.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/LESdelta/LESdelta.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/LESdelta/newDelta.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/Make/files (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/Make/options (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/PrandtlDelta/PrandtlDelta.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/PrandtlDelta/PrandtlDelta.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/smoothDelta/smoothDelta.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/smoothDelta/smoothDelta.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/LESfilter/LESfilter.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/LESfilter/LESfilter.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/LESfilter/newFilter.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/Make/files (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/Make/options (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/anisotropicFilter/anisotropicFilter.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/anisotropicFilter/anisotropicFilter.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/laplaceFilter/laplaceFilter.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/laplaceFilter/laplaceFilter.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/simpleFilter/simpleFilter.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/LESfilters/simpleFilter/simpleFilter.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/DeardorffDiffStress/DeardorffDiffStress.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/DeardorffDiffStress/DeardorffDiffStress.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/GenEddyVisc/GenEddyVisc.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/GenEddyVisc/GenEddyVisc.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/GenSGSStress/GenSGSStress.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/GenSGSStress/GenSGSStress.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/LESmodel/LESmodel.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/LESmodel/LESmodel.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/LESmodel/newLESmodel.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/Make/files (100%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/Make/options (68%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/Smagorinsky/Smagorinsky.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/Smagorinsky/Smagorinsky.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/SpalartAllmaras/SpalartAllmaras.C (99%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/SpalartAllmaras/SpalartAllmaras.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/dynOneEqEddy/dynOneEqEddy.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/dynOneEqEddy/dynOneEqEddy.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/lowReOneEqEddy/lowReOneEqEddy.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/lowReOneEqEddy/lowReOneEqEddy.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/oneEqEddy/oneEqEddy.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/oneEqEddy/oneEqEddy.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C (99%)
rename src/{LESmodels => turbulenceModels/LES}/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/DeardorffDiffStress/DeardorffDiffStress.C (89%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/DeardorffDiffStress/DeardorffDiffStress.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/GenEddyVisc/GenEddyVisc.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/GenEddyVisc/GenEddyVisc.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/GenSGSStress/GenSGSStress.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/GenSGSStress/GenSGSStress.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/LESmodel/LESmodel.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/LESmodel/LESmodel.H (100%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/LESmodel/newLESmodel.C (100%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/LRRDiffStress/LRRDiffStress.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/LRRDiffStress/LRRDiffStress.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/Make/files (100%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/Make/options (56%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/Smagorinsky/Smagorinsky.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/Smagorinsky/Smagorinsky.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/Smagorinsky2/Smagorinsky2.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/Smagorinsky2/Smagorinsky2.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/SpalartAllmaras/SpalartAllmaras.C (99%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/SpalartAllmaras/SpalartAllmaras.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/dynOneEqEddy/dynOneEqEddy.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/dynOneEqEddy/dynOneEqEddy.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/dynSmagorinsky/dynSmagorinsky.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/dynSmagorinsky/dynSmagorinsky.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/laminar/laminar.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/laminar/laminar.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/locDynOneEqEddy/locDynOneEqEddy.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/locDynOneEqEddy/locDynOneEqEddy.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/mixedSmagorinsky/mixedSmagorinsky.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/mixedSmagorinsky/mixedSmagorinsky.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/oneEqEddy/oneEqEddy.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/oneEqEddy/oneEqEddy.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/scaleSimilarity/scaleSimilarity.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/scaleSimilarity/scaleSimilarity.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/spectEddyVisc/spectEddyVisc.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/spectEddyVisc/spectEddyVisc.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/vanDriestDelta/vanDriestDelta.C (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/vanDriestDelta/vanDriestDelta.H (98%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C (99%)
rename src/{LESmodels => turbulenceModels/LES}/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H (98%)
create mode 100755 src/turbulenceModels/RAS/Allwmake
rename src/turbulenceModels/{ => RAS}/compressible/LRR/LRR.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/LRR/LRR.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/LaunderSharmaKE/LaunderSharmaKE.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/LaunderSharmaKE/LaunderSharmaKE.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/LaunderSharmaKE/sourceFiles (100%)
rename src/turbulenceModels/{ => RAS}/compressible/Make/files (100%)
rename src/turbulenceModels/{ => RAS}/compressible/Make/options (100%)
rename src/turbulenceModels/{ => RAS}/compressible/RNGkEpsilon/RNGkEpsilon.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/RNGkEpsilon/RNGkEpsilon.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/RNGkEpsilon/sourceFiles (100%)
rename src/turbulenceModels/{ => RAS}/compressible/SpalartAllmaras/SpalartAllmaras.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/SpalartAllmaras/SpalartAllmaras.H (98%)
rename src/turbulenceModels/{ => RAS}/compressible/kEpsilon/kEpsilon.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/kEpsilon/kEpsilon.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H (100%)
rename src/turbulenceModels/{ => RAS}/compressible/kOmegaSST/kOmegaSST.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/kOmegaSST/kOmegaSST.H (98%)
rename src/turbulenceModels/{ => RAS}/compressible/kOmegaSST/kOmegaWallFunctionsI.H (100%)
rename src/turbulenceModels/{ => RAS}/compressible/kOmegaSST/kOmegaWallViscosityI.H (100%)
rename src/turbulenceModels/{ => RAS}/compressible/kOmegaSST/wallOmegaI.H (100%)
rename src/turbulenceModels/{ => RAS}/compressible/laminar/laminar.C (98%)
rename src/turbulenceModels/{ => RAS}/compressible/laminar/laminar.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/realizableKE/realizableKE.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/realizableKE/realizableKE.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/turbulenceModel/newTurbulenceModel.C (100%)
rename src/turbulenceModels/{ => RAS}/compressible/turbulenceModel/turbulenceModel.C (100%)
rename src/turbulenceModels/{ => RAS}/compressible/turbulenceModel/turbulenceModel.H (98%)
rename src/turbulenceModels/{ => RAS}/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C (99%)
rename src/turbulenceModels/{ => RAS}/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H (97%)
rename src/turbulenceModels/{ => RAS}/compressible/wallFunctions/wallDissipationI.H (100%)
rename src/turbulenceModels/{ => RAS}/compressible/wallFunctions/wallFunctionsI.H (100%)
rename src/turbulenceModels/{ => RAS}/compressible/wallFunctions/wallViscosityI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/LRR/LRR.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/LRR/LRR.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/LamBremhorstKE/LamBremhorstKE.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/LamBremhorstKE/LamBremhorstKE.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C (99%)
rename src/turbulenceModels/{ => RAS}/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/LaunderSharmaKE/LaunderSharmaKE.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/LaunderSharmaKE/LaunderSharmaKE.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienCubicKE/LienCubicKE.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienCubicKE/LienCubicKE.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienCubicKELowRe/LienCubicKELowRe.C (99%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienCubicKELowRe/LienCubicKELowRe.H (97%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/Make/files (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/Make/options (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/NonlinearKEShih/NonlinearKEShih.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/NonlinearKEShih/NonlinearKEShih.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/QZeta/QZeta.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/QZeta/QZeta.H (97%)
rename src/turbulenceModels/{ => RAS}/incompressible/RNGkEpsilon/RNGkEpsilon.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/RNGkEpsilon/RNGkEpsilon.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/SpalartAllmaras/SpalartAllmaras.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/SpalartAllmaras/SpalartAllmaras.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/kEpsilon/kEpsilon.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/kEpsilon/kEpsilon.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/kOmegaSST/kOmegaSST.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/kOmegaSST/kOmegaSST.H (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/kOmegaSST/kOmegaWallFunctionsI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/kOmegaSST/kOmegaWallViscosityI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/kOmegaSST/wallOmegaI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/laminar/laminar.C (97%)
rename src/turbulenceModels/{ => RAS}/incompressible/laminar/laminar.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/realizableKE/realizableKE.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/realizableKE/realizableKE.H (97%)
rename src/turbulenceModels/{ => RAS}/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/turbulenceModel/newTurbulenceModel.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/turbulenceModel/turbulenceModel.C (98%)
rename src/turbulenceModels/{ => RAS}/incompressible/turbulenceModel/turbulenceModel.H (97%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nonLinearWallFunctionsI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C (97%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C (95%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H (96%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/wallDissipationI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/wallFunctionsI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/wallNonlinearViscosityI.H (100%)
rename src/turbulenceModels/{ => RAS}/incompressible/wallFunctions/wallViscosityI.H (100%)
diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 5217f896993..09322fe8653 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 4526fc31bbc..357e749e987 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -35,7 +35,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -55,12 +55,15 @@ PDRkEpsilon::PDRkEpsilon
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
- Cmu(turbulenceModelCoeffs_.lookup("Cmu")),
- C1(turbulenceModelCoeffs_.lookup("C1")),
- C2(turbulenceModelCoeffs_.lookup("C2")),
- alphak(turbulenceModelCoeffs_.lookup("alphak")),
- alphaEps(turbulenceModelCoeffs_.lookup("alphaEps")),
- alphah(turbulenceModelCoeffs_.lookup("alphah")),
+ Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
+ C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
+ C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
+ alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
+ alphaEps
+ (
+ turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
+ ),
+ alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_
(
@@ -102,6 +105,8 @@ PDRkEpsilon::PDRkEpsilon
)
{
# include "wallViscosityI.H"
+
+ printCoeffs();
}
@@ -161,12 +166,12 @@ bool PDRkEpsilon::read()
{
if (turbulenceModel::read())
{
- turbulenceModelCoeffs_.lookup("Cmu") >> Cmu;
- turbulenceModelCoeffs_.lookup("C1") >> C1;
- turbulenceModelCoeffs_.lookup("C2") >> C2;
- turbulenceModelCoeffs_.lookup("alphak") >> alphak;
- turbulenceModelCoeffs_.lookup("alphaEps") >> alphaEps;
- turbulenceModelCoeffs_.lookup("alphah") >> alphah;
+ turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
+ turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
+ turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
+ turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak);
+ turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
+ turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true;
}
@@ -204,7 +209,7 @@ void PDRkEpsilon::correct()
// in both the k and epsilon equations
const volScalarField& betav = U_.db().lookupObject<volScalarField>("betav");
- const PDRDragModel& drag =
+ const PDRDragModel& drag =
U_.db().lookupObject<PDRDragModel>("PDRDragModel");
volScalarField GR = drag.Gk();
@@ -259,7 +264,7 @@ void PDRkEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index b2546074ca1..7b207abeb44 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -45,7 +45,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -58,12 +58,12 @@ class PDRkEpsilon
{
// Private data
- dimensionedScalar Cmu;
- dimensionedScalar C1;
- dimensionedScalar C2;
- dimensionedScalar alphak;
- dimensionedScalar alphaEps;
- dimensionedScalar alphah;
+ scalar Cmu;
+ scalar C1;
+ scalar C2;
+ scalar alphak;
+ scalar alphaEps;
+ scalar alphah;
volScalarField k_;
volScalarField epsilon_;
@@ -103,7 +103,7 @@ public:
//- Return the effective diffusivity for k
tmp<volScalarField> DkEff() const
{
- return tmp<volScalarField>
+ return tmp<volScalarField>
(
new volScalarField("DkEff", alphak*mut_ + mu())
);
@@ -112,7 +112,7 @@ public:
//- Return the effective diffusivity for epsilon
tmp<volScalarField> DepsilonEff() const
{
- return tmp<volScalarField>
+ return tmp<volScalarField>
(
new volScalarField("DepsilonEff", alphaEps*mut_ + mu())
);
@@ -121,7 +121,7 @@ public:
//- Return the effective turbulent thermal diffusivity
tmp<volScalarField> alphaEff() const
{
- return tmp<volScalarField>
+ return tmp<volScalarField>
(
new volScalarField("alphaEff", alphah*mut_ + alpha())
);
@@ -158,7 +158,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index 1e5f789db1d..c6457c2826b 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
EXE_LIBS = \
diff --git a/applications/solvers/combustion/Xoodles/Make/options b/applications/solvers/combustion/Xoodles/Make/options
index 13de0659a58..085bbba8f4e 100644
--- a/applications/solvers/combustion/Xoodles/Make/options
+++ b/applications/solvers/combustion/Xoodles/Make/options
@@ -3,8 +3,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index a55eb60c564..d932a5dbc16 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude
+ -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude
EXE_LIBS = \
-lengine \
diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options
index 0179a3a3301..c3928b42749 100644
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I../engineFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options
index 896e479db50..b19c304f706 100644
--- a/applications/solvers/combustion/dieselFoam/Make/options
+++ b/applications/solvers/combustion/dieselFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I../dieselEngineFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options
index e05f5809607..952aa3091a9 100644
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-I../XiFoam
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index 28ce92ba32a..ad9827feb7b 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I../XiFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/solvers/compressible/coodles/Make/options b/applications/solvers/compressible/coodles/Make/options
index ddf6a7b342c..1bc6e360d0b 100644
--- a/applications/solvers/compressible/coodles/Make/options
+++ b/applications/solvers/compressible/coodles/Make/options
@@ -2,8 +2,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index 6e789b67e21..1679646dc1d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
index c3b1a00728b..46c3f63621b 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index 6e789b67e21..1679646dc1d 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/rhoTurbFoam/Make/options b/applications/solvers/compressible/rhoTurbFoam/Make/options
index 8fe0a8bfd40..9a953a45d4f 100644
--- a/applications/solvers/compressible/rhoTurbFoam/Make/options
+++ b/applications/solvers/compressible/rhoTurbFoam/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/compressible/sonicTurbFoam/Make/options b/applications/solvers/compressible/sonicTurbFoam/Make/options
index 87490408ffe..42838550d11 100644
--- a/applications/solvers/compressible/sonicTurbFoam/Make/options
+++ b/applications/solvers/compressible/sonicTurbFoam/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I../sonicFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
new file mode 100644
index 00000000000..331a2aaa7ec
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
@@ -0,0 +1,14 @@
+ nAveragingSteps++;
+
+ scalar nm1Coeff = scalar(nAveragingSteps - 1)/nAveragingSteps;
+ scalar nCoeff = 1.0/nAveragingSteps;
+
+ R += sqr(Umean);
+ Umean = nm1Coeff*Umean + nCoeff*U;
+ R = nm1Coeff*R + nCoeff*sqr(U) - sqr(Umean);
+ Bmean = nm1Coeff*Bmean + nCoeff*sgsModel->B();
+ epsilonMean = nm1Coeff*epsilonMean + nCoeff*sgsModel->epsilon();
+
+ pPrime2Mean += sqr(pMean);
+ pMean = nm1Coeff*pMean + nCoeff*p;
+ pPrime2Mean = nm1Coeff*pPrime2Mean + nCoeff*sqr(p) - sqr(pMean);
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
new file mode 100644
index 00000000000..331a2aaa7ec
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
@@ -0,0 +1,14 @@
+ nAveragingSteps++;
+
+ scalar nm1Coeff = scalar(nAveragingSteps - 1)/nAveragingSteps;
+ scalar nCoeff = 1.0/nAveragingSteps;
+
+ R += sqr(Umean);
+ Umean = nm1Coeff*Umean + nCoeff*U;
+ R = nm1Coeff*R + nCoeff*sqr(U) - sqr(Umean);
+ Bmean = nm1Coeff*Bmean + nCoeff*sgsModel->B();
+ epsilonMean = nm1Coeff*epsilonMean + nCoeff*sgsModel->epsilon();
+
+ pPrime2Mean += sqr(pMean);
+ pMean = nm1Coeff*pMean + nCoeff*p;
+ pPrime2Mean = nm1Coeff*pPrime2Mean + nCoeff*sqr(p) - sqr(pMean);
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
new file mode 100644
index 00000000000..331a2aaa7ec
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
@@ -0,0 +1,14 @@
+ nAveragingSteps++;
+
+ scalar nm1Coeff = scalar(nAveragingSteps - 1)/nAveragingSteps;
+ scalar nCoeff = 1.0/nAveragingSteps;
+
+ R += sqr(Umean);
+ Umean = nm1Coeff*Umean + nCoeff*U;
+ R = nm1Coeff*R + nCoeff*sqr(U) - sqr(Umean);
+ Bmean = nm1Coeff*Bmean + nCoeff*sgsModel->B();
+ epsilonMean = nm1Coeff*epsilonMean + nCoeff*sgsModel->epsilon();
+
+ pPrime2Mean += sqr(pMean);
+ pMean = nm1Coeff*pMean + nCoeff*p;
+ pPrime2Mean = nm1Coeff*pPrime2Mean + nCoeff*sqr(p) - sqr(pMean);
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
new file mode 100644
index 00000000000..64e53cdc778
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
@@ -0,0 +1,234 @@
+ label nAveragingSteps = 1;
+
+ IFstream nAveragingStepsFile
+ (
+ runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw"
+ );
+
+
+ autoPtr<volVectorField> UmeanPtr;
+ autoPtr<volSymmTensorField> RPtr;
+ autoPtr<volSymmTensorField> BmeanPtr;
+ autoPtr<volScalarField> epsilonMeanPtr;
+
+ autoPtr<volScalarField> pMeanPtr;
+ autoPtr<volScalarField> pPrime2MeanPtr;
+
+ if (nAveragingStepsFile.good())
+ {
+ nAveragingStepsFile >> nAveragingSteps;
+
+ Info<< "Reading field Umean\n" << endl;
+ UmeanPtr.reset
+ (
+ new volVectorField
+ (
+ IOobject
+ (
+ "Umean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field R\n" << endl;
+ RPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "R",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field Bmean\n" << endl;
+ BmeanPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "Bmean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field epsilonMean\n" << endl;
+ epsilonMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "epsilonMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "Reading field pMean\n" << endl;
+ pMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "Reading field pPrime2Mean\n" << endl;
+ pPrime2MeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pPrime2Mean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+ }
+ else
+ {
+ Info<< "Creating field Umean\n" << endl;
+ UmeanPtr.reset
+ (
+ new volVectorField
+ (
+ IOobject
+ (
+ "Umean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ U
+ )
+ );
+
+ Info<< "Creating field R\n" << endl;
+ RPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "R",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sqr(U) - sqr(UmeanPtr())
+ )
+ );
+
+ Info<< "Creating field Bmean\n" << endl;
+ BmeanPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "Bmean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sgsModel->B()
+ )
+ );
+
+ Info<< "Creating field epsilonMean\n" << endl;
+ epsilonMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "epsilonMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sgsModel->epsilon()
+ )
+ );
+
+ Info<< "Creating field pMean\n" << endl;
+ pMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ p
+ )
+ );
+
+ Info<< "Creating field pPrime2Mean\n" << endl;
+ pPrime2MeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pPrime2Mean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sqr(p) - sqr(pMeanPtr())
+ )
+ );
+ }
+
+ volVectorField& Umean = UmeanPtr();
+ volSymmTensorField& R = RPtr();
+ volSymmTensorField& Bmean = BmeanPtr();
+ volScalarField& epsilonMean = epsilonMeanPtr();
+
+ volScalarField& pMean = pMeanPtr();
+ volScalarField& pPrime2Mean = pPrime2MeanPtr();
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
new file mode 100644
index 00000000000..64e53cdc778
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
@@ -0,0 +1,234 @@
+ label nAveragingSteps = 1;
+
+ IFstream nAveragingStepsFile
+ (
+ runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw"
+ );
+
+
+ autoPtr<volVectorField> UmeanPtr;
+ autoPtr<volSymmTensorField> RPtr;
+ autoPtr<volSymmTensorField> BmeanPtr;
+ autoPtr<volScalarField> epsilonMeanPtr;
+
+ autoPtr<volScalarField> pMeanPtr;
+ autoPtr<volScalarField> pPrime2MeanPtr;
+
+ if (nAveragingStepsFile.good())
+ {
+ nAveragingStepsFile >> nAveragingSteps;
+
+ Info<< "Reading field Umean\n" << endl;
+ UmeanPtr.reset
+ (
+ new volVectorField
+ (
+ IOobject
+ (
+ "Umean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field R\n" << endl;
+ RPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "R",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field Bmean\n" << endl;
+ BmeanPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "Bmean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field epsilonMean\n" << endl;
+ epsilonMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "epsilonMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "Reading field pMean\n" << endl;
+ pMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "Reading field pPrime2Mean\n" << endl;
+ pPrime2MeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pPrime2Mean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+ }
+ else
+ {
+ Info<< "Creating field Umean\n" << endl;
+ UmeanPtr.reset
+ (
+ new volVectorField
+ (
+ IOobject
+ (
+ "Umean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ U
+ )
+ );
+
+ Info<< "Creating field R\n" << endl;
+ RPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "R",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sqr(U) - sqr(UmeanPtr())
+ )
+ );
+
+ Info<< "Creating field Bmean\n" << endl;
+ BmeanPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "Bmean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sgsModel->B()
+ )
+ );
+
+ Info<< "Creating field epsilonMean\n" << endl;
+ epsilonMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "epsilonMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sgsModel->epsilon()
+ )
+ );
+
+ Info<< "Creating field pMean\n" << endl;
+ pMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ p
+ )
+ );
+
+ Info<< "Creating field pPrime2Mean\n" << endl;
+ pPrime2MeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pPrime2Mean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sqr(p) - sqr(pMeanPtr())
+ )
+ );
+ }
+
+ volVectorField& Umean = UmeanPtr();
+ volSymmTensorField& R = RPtr();
+ volSymmTensorField& Bmean = BmeanPtr();
+ volScalarField& epsilonMean = epsilonMeanPtr();
+
+ volScalarField& pMean = pMeanPtr();
+ volScalarField& pPrime2Mean = pPrime2MeanPtr();
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
new file mode 100644
index 00000000000..64e53cdc778
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
@@ -0,0 +1,234 @@
+ label nAveragingSteps = 1;
+
+ IFstream nAveragingStepsFile
+ (
+ runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw"
+ );
+
+
+ autoPtr<volVectorField> UmeanPtr;
+ autoPtr<volSymmTensorField> RPtr;
+ autoPtr<volSymmTensorField> BmeanPtr;
+ autoPtr<volScalarField> epsilonMeanPtr;
+
+ autoPtr<volScalarField> pMeanPtr;
+ autoPtr<volScalarField> pPrime2MeanPtr;
+
+ if (nAveragingStepsFile.good())
+ {
+ nAveragingStepsFile >> nAveragingSteps;
+
+ Info<< "Reading field Umean\n" << endl;
+ UmeanPtr.reset
+ (
+ new volVectorField
+ (
+ IOobject
+ (
+ "Umean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field R\n" << endl;
+ RPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "R",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field Bmean\n" << endl;
+ BmeanPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "Bmean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "\nReading field epsilonMean\n" << endl;
+ epsilonMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "epsilonMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "Reading field pMean\n" << endl;
+ pMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+
+ Info<< "Reading field pPrime2Mean\n" << endl;
+ pPrime2MeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pPrime2Mean",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
+ );
+ }
+ else
+ {
+ Info<< "Creating field Umean\n" << endl;
+ UmeanPtr.reset
+ (
+ new volVectorField
+ (
+ IOobject
+ (
+ "Umean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ U
+ )
+ );
+
+ Info<< "Creating field R\n" << endl;
+ RPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "R",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sqr(U) - sqr(UmeanPtr())
+ )
+ );
+
+ Info<< "Creating field Bmean\n" << endl;
+ BmeanPtr.reset
+ (
+ new volSymmTensorField
+ (
+ IOobject
+ (
+ "Bmean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sgsModel->B()
+ )
+ );
+
+ Info<< "Creating field epsilonMean\n" << endl;
+ epsilonMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "epsilonMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sgsModel->epsilon()
+ )
+ );
+
+ Info<< "Creating field pMean\n" << endl;
+ pMeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pMean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ p
+ )
+ );
+
+ Info<< "Creating field pPrime2Mean\n" << endl;
+ pPrime2MeanPtr.reset
+ (
+ new volScalarField
+ (
+ IOobject
+ (
+ "pPrime2Mean",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ sqr(p) - sqr(pMeanPtr())
+ )
+ );
+ }
+
+ volVectorField& Umean = UmeanPtr();
+ volSymmTensorField& R = RPtr();
+ volSymmTensorField& Bmean = BmeanPtr();
+ volScalarField& epsilonMean = epsilonMeanPtr();
+
+ volScalarField& pMean = pMeanPtr();
+ volScalarField& pPrime2Mean = pPrime2MeanPtr();
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e
new file mode 100644
index 00000000000..f590d9ba6ff
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e
@@ -0,0 +1,18 @@
+ if (runTime.outputTime())
+ {
+ OFstream nAveragingStepsFile
+ (
+ runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw"
+ );
+
+ if (nAveragingStepsFile.good())
+ {
+ nAveragingStepsFile << nAveragingSteps << endl;
+ }
+ else
+ {
+ FatalErrorIn(args.executable())
+ << "Cannot open file " << nAveragingStepsFile.name()
+ << abort(FatalError);
+ }
+ }
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
new file mode 100644
index 00000000000..f590d9ba6ff
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0
@@ -0,0 +1,18 @@
+ if (runTime.outputTime())
+ {
+ OFstream nAveragingStepsFile
+ (
+ runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw"
+ );
+
+ if (nAveragingStepsFile.good())
+ {
+ nAveragingStepsFile << nAveragingSteps << endl;
+ }
+ else
+ {
+ FatalErrorIn(args.executable())
+ << "Cannot open file " << nAveragingStepsFile.name()
+ << abort(FatalError);
+ }
+ }
diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
new file mode 100644
index 00000000000..f590d9ba6ff
--- /dev/null
+++ b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1
@@ -0,0 +1,18 @@
+ if (runTime.outputTime())
+ {
+ OFstream nAveragingStepsFile
+ (
+ runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw"
+ );
+
+ if (nAveragingStepsFile.good())
+ {
+ nAveragingStepsFile << nAveragingSteps << endl;
+ }
+ else
+ {
+ FatalErrorIn(args.executable())
+ << "Cannot open file " << nAveragingStepsFile.name()
+ << abort(FatalError);
+ }
+ }
diff --git a/applications/solvers/heatTransfer/buoyantFoam/Make/options b/applications/solvers/heatTransfer/buoyantFoam/Make/options
index 182c88e2912..ea9f7366bc8 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I../XiFoam
EXE_LIBS = \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index 6e789b67e21..1679646dc1d 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
index 12943280aad..52101087170 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index 6bf54dad003..2fe2cc72a36 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -7,7 +7,7 @@ EXE_INC = \
-IderivedFvPatchFields/solidWallHeatFluxTemperatureCoupled \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/turbulenceModels
+ -I$(LIB_SRC)/turbulenceModels/RAS
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.H
index a6f265faae1..52917154401 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.H
@@ -120,7 +120,7 @@ public:
inline const fvMesh& neighbourRegion() const;
//- Return the neighbour patch ID
- inline const label neighbourPatchID() const;
+ inline label neighbourPatchID() const;
//- Return a reference to the neighbour patch
inline const fvPatch& neighbourPatch() const;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H
index 5a252d87042..d660ada8189 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H
@@ -55,7 +55,7 @@ inline const Foam::fvMesh& Foam::coupleManager::neighbourRegion() const
}
-inline const Foam::label Foam::coupleManager::neighbourPatchID() const
+inline Foam::label Foam::coupleManager::neighbourPatchID() const
{
return neighbourRegion().boundaryMesh().findPatchID(neighbourPatchName_);
}
diff --git a/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options b/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
index 9413e969c3a..2dc02308d79 100644
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/Make/options
@@ -2,8 +2,8 @@ EXE_INC = \
-I../buoyantFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index 9f6d88d3ea6..89e1642a87f 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/sampling/lnInclude
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 60f3062d371..31c3ac59155 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -31,9 +31,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/channelOodles/Make/options b/applications/solvers/incompressible/channelOodles/Make/options
index 36e475b86ca..5f39a2f0934 100644
--- a/applications/solvers/incompressible/channelOodles/Make/options
+++ b/applications/solvers/incompressible/channelOodles/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
diff --git a/applications/solvers/incompressible/oodles/Make/options b/applications/solvers/incompressible/oodles/Make/options
index 0247c89bbef..38a50d77668 100644
--- a/applications/solvers/incompressible/oodles/Make/options
+++ b/applications/solvers/incompressible/oodles/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index ef6915707cb..13680640c47 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index 84478adc3c3..020d1798393 100644
--- a/applications/solvers/incompressible/simpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -36,7 +36,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/incompressible/turbDyMFoam/Make/options b/applications/solvers/incompressible/turbDyMFoam/Make/options
index 2a1549655e8..633daf3e733 100644
--- a/applications/solvers/incompressible/turbDyMFoam/Make/options
+++ b/applications/solvers/incompressible/turbDyMFoam/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/applications/solvers/incompressible/turbDyMFoam/createFields.H b/applications/solvers/incompressible/turbDyMFoam/createFields.H
index a536e9cce6b..ff3f9c51696 100644
--- a/applications/solvers/incompressible/turbDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/turbDyMFoam/createFields.H
@@ -37,9 +37,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
Info<< "Reading field rAU if present\n" << endl;
diff --git a/applications/solvers/incompressible/turbFoam/Make/options b/applications/solvers/incompressible/turbFoam/Make/options
index 949db752748..b8036f1d38c 100644
--- a/applications/solvers/incompressible/turbFoam/Make/options
+++ b/applications/solvers/incompressible/turbFoam/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/applications/solvers/incompressible/turbFoam/createFields.H b/applications/solvers/incompressible/turbFoam/createFields.H
index 8025fb372ea..7cae304f6f6 100644
--- a/applications/solvers/incompressible/turbFoam/createFields.H
+++ b/applications/solvers/incompressible/turbFoam/createFields.H
@@ -36,7 +36,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
diff --git a/applications/solvers/multiphase/compressibleLesInterFoam/Make/options b/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
index 7f7317e77a1..acc310726a8 100644
--- a/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleLesInterFoam/Make/options
@@ -4,8 +4,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index 0f706f8621b..ddd0160b007 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@@ -2,8 +2,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/turbulenceModels/incompressible/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
+ -I$(LIB_SRC)/turbulenceModels/RAS/incompressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 464d28cc45c..48e8f1da205 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -86,10 +86,10 @@
// Construct interface from gamma distribution
interfaceProperties interface(gamma, U, twoPhaseProperties);
- // Construct LES model
- autoPtr<turbulenceModel> turbulence
+ // Construct incompressible RAS model
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, twoPhaseProperties)
+ incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
);
wordList pcorrTypes(pd.boundaryField().types());
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
index f1f3bf58153..af6ebd0be3d 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
@@ -2,8 +2,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-IphaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture \
-I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/Make/options b/applications/solvers/multiphase/lesCavitatingFoam/Make/options
index 100c5a0cacc..988b21f834e 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/lesCavitatingFoam/Make/options
@@ -3,9 +3,9 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/incompressible/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/incompressible/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
EXE_LIBS = \
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
index 3a5db93cb88..2e519dc17ca 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
+++ b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -64,8 +64,10 @@ devOneEqEddy::devOneEqEddy
mesh_
),
- ck_(LESmodelProperties().lookup("ck"))
-{}
+ ck_(LESmodelProperties().lookupOrAddDefault("ck", 0.07))
+{
+ printCoeffs();
+}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@@ -99,7 +101,7 @@ bool devOneEqEddy::read()
{
if (GenEddyVisc::read())
{
- LESmodelProperties().lookup("ck") >> ck_;
+ LESmodelProperties().readIfPresent<scalar>("ck", ck_);
return true;
}
@@ -112,7 +114,7 @@ bool devOneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
index 6581e962c4a..4e0763a101f 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
+++ b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
@@ -61,7 +61,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -76,7 +76,7 @@ class devOneEqEddy
volScalarField k_;
- dimensionedScalar ck_;
+ scalar ck_;
// Private Member Functions
@@ -119,7 +119,7 @@ public:
//- Return the effective diffusivity for k
tmp<volScalarField> DkEff() const
{
- return tmp<volScalarField>
+ return tmp<volScalarField>
(
new volScalarField("DkEff", nuSgs_ + nu())
);
diff --git a/applications/solvers/multiphase/lesInterFoam/Make/options b/applications/solvers/multiphase/lesInterFoam/Make/options
index 16b59ec9892..3c761572bf6 100644
--- a/applications/solvers/multiphase/lesInterFoam/Make/options
+++ b/applications/solvers/multiphase/lesInterFoam/Make/options
@@ -4,8 +4,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/options b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
index ffd4930257d..4c09b3efbed 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/rasCavitatingFoam/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
EXE_LIBS = \
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
index 21f5b136bbd..da236f7673d 100644
--- a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H
@@ -79,7 +79,7 @@
twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
// Create RAS turbulence model
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phiv, twoPhaseProperties)
+ incompressible::turbulenceModel::New(U, phiv, twoPhaseProperties)
);
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/options b/applications/solvers/multiphase/rasInterFoam/Make/options
index 4994db0f961..27d86562c37 100644
--- a/applications/solvers/multiphase/rasInterFoam/Make/options
+++ b/applications/solvers/multiphase/rasInterFoam/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
diff --git a/applications/solvers/multiphase/rasInterFoam/createFields.H b/applications/solvers/multiphase/rasInterFoam/createFields.H
index 988e8b3f744..8a3e4d22f05 100644
--- a/applications/solvers/multiphase/rasInterFoam/createFields.H
+++ b/applications/solvers/multiphase/rasInterFoam/createFields.H
@@ -110,7 +110,7 @@
interfaceProperties interface(gamma, U, twoPhaseProperties);
// Construct LES model
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, twoPhaseProperties)
+ incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
);
diff --git a/applications/utilities/postProcessing/dataConversion/hashSetUnion.H b/applications/utilities/postProcessing/dataConversion/hashSetUnion.H
new file mode 100644
index 00000000000..4f2052f73c6
--- /dev/null
+++ b/applications/utilities/postProcessing/dataConversion/hashSetUnion.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::hashSetUnionEqOp
+
+Description
+ Union operation to combine hash sets
+ Usage: combineReduce(myWordHashSet, unionEqOp<word>());
+
+\*---------------------------------------------------------------------------*/
+
+namespace Foam
+{
+ template<class Type>
+ class hashSetUnionEqOp
+ {
+ public:
+ void operator()(HashSet<Type>& x, const HashSet<Type>& y) const
+ {
+ forAllConstIter(typename HashSet<Type>, y, iter)
+ {
+ x.insert(iter.key());
+ }
+ }
+ };
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/dataConversion/hashTableUnion.H b/applications/utilities/postProcessing/dataConversion/hashTableUnion.H
new file mode 100644
index 00000000000..816485d1137
--- /dev/null
+++ b/applications/utilities/postProcessing/dataConversion/hashTableUnion.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::hashTableUnionEqOp
+
+Description
+ Union operation to combine hash sets
+ Usage: combineReduce(myWordHashSet, unionEqOp<word>());
+
+\*---------------------------------------------------------------------------*/
+
+namespace Foam
+{
+ template<class Type>
+ class hashTableUnionEqOp
+ {
+ public:
+ void operator()(HashTable<Type>& x, const HashTable<Type>& y) const
+ {
+ forAllConstIter(typename HashTable<Type>, y, iter)
+ {
+ x.insert(iter.key(), iter());
+ }
+ }
+ };
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index f67d6a42542..f6c92548fc5 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -2,9 +2,9 @@ EXE_INC = \
-I$(FOAM_SRC)/postProcessing/postCalc \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
- -I$(LIB_SRC)/LESmodels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 9c8c7504946..9d437d43555 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -148,9 +148,14 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
if (turbulenceProperties.found("turbulenceModel"))
{
- autoPtr<turbulenceModel> turbulenceModel
+ autoPtr<incompressible::turbulenceModel> turbulenceModel
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New
+ (
+ U,
+ phi,
+ laminarTransport
+ )
);
execFlowFunctionObjects(args, runTime);
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
index 47f63723e30..b0d119d8887 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options
+++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 149b58cc981..8b6867b6fc9 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/turbulence/R/createFields.H b/applications/utilities/postProcessing/turbulence/R/createFields.H
index 35ea975f36a..72d049103da 100644
--- a/applications/utilities/postProcessing/turbulence/R/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/R/createFields.H
@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index 47f63723e30..b0d119d8887 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
index 35ea975f36a..72d049103da 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index 6802a3c91fb..eae57baa897 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -4,9 +4,9 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
- -I$(LIB_SRC)/LESmodels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index cd5d76740ba..52cd861cbd9 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -100,9 +100,14 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
if (turbulenceProperties.found("turbulenceModel"))
{
- autoPtr<turbulenceModel> turbulenceModel
+ autoPtr<incompressible::turbulenceModel> turbulenceModel
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New
+ (
+ U,
+ phi,
+ laminarTransport
+ )
);
PePtr.set
diff --git a/applications/utilities/postProcessing/wall/wallGradU/Make/options b/applications/utilities/postProcessing/wall/wallGradU/Make/options
index b0e647e10a1..6437903e0c0 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/Make/options
+++ b/applications/utilities/postProcessing/wall/wallGradU/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index 49c8ba9144d..bcd694b4251 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)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index b0e647e10a1..6437903e0c0 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/createFields.H b/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
index 35ea975f36a..72d049103da 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallShearStress/createFields.H
@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
index cb15a51f9ab..d1465c1a7cf 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
- -I$(LIB_SRC)/LESmodels \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index b0e647e10a1..6437903e0c0 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 6792332b65b..2f53660d111 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> turbulence
(
- turbulenceModel::New(U, phi, laminarTransport)
+ incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
const fvPatchList& patches = mesh.boundary();
diff --git a/src/Allwmake b/src/Allwmake
index 1db8264e3f7..f7b68983c6f 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -29,7 +29,6 @@ wmake libso randomProcesses
( cd thermophysicalModels && ./Allwmake )
( cd transportModels && ./Allwmake )
( cd turbulenceModels && ./Allwmake )
-( cd LESmodels && ./Allwmake )
( cd lagrangian && ./Allwmake )
( cd postProcessing && ./Allwmake )
diff --git a/src/turbulenceModels/Allwmake b/src/turbulenceModels/Allwmake
index 5ccba2b371a..a05e81fc00a 100755
--- a/src/turbulenceModels/Allwmake
+++ b/src/turbulenceModels/Allwmake
@@ -1,5 +1,5 @@
#!/bin/sh
set -x
-wmake libso incompressible
-wmake libso compressible
+( cd RAS && ./Allwmake )
+( cd LES && ./Allwmake )
diff --git a/src/LESmodels/Allwmake b/src/turbulenceModels/LES/Allwmake
similarity index 100%
rename from src/LESmodels/Allwmake
rename to src/turbulenceModels/LES/Allwmake
diff --git a/src/LESmodels/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
similarity index 100%
rename from src/LESmodels/LESdeltas/LESdelta/LESdelta.C
rename to src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
diff --git a/src/LESmodels/LESdeltas/LESdelta/LESdelta.H b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
similarity index 100%
rename from src/LESmodels/LESdeltas/LESdelta/LESdelta.H
rename to src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
diff --git a/src/LESmodels/LESdeltas/LESdelta/newDelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
similarity index 100%
rename from src/LESmodels/LESdeltas/LESdelta/newDelta.C
rename to src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
diff --git a/src/LESmodels/LESdeltas/Make/files b/src/turbulenceModels/LES/LESdeltas/Make/files
similarity index 100%
rename from src/LESmodels/LESdeltas/Make/files
rename to src/turbulenceModels/LES/LESdeltas/Make/files
diff --git a/src/LESmodels/LESdeltas/Make/options b/src/turbulenceModels/LES/LESdeltas/Make/options
similarity index 100%
rename from src/LESmodels/LESdeltas/Make/options
rename to src/turbulenceModels/LES/LESdeltas/Make/options
diff --git a/src/LESmodels/LESdeltas/PrandtlDelta/PrandtlDelta.C b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
similarity index 100%
rename from src/LESmodels/LESdeltas/PrandtlDelta/PrandtlDelta.C
rename to src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
diff --git a/src/LESmodels/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
similarity index 100%
rename from src/LESmodels/LESdeltas/PrandtlDelta/PrandtlDelta.H
rename to src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
diff --git a/src/LESmodels/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
similarity index 100%
rename from src/LESmodels/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
rename to src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
diff --git a/src/LESmodels/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
similarity index 100%
rename from src/LESmodels/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
rename to src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
diff --git a/src/LESmodels/LESdeltas/smoothDelta/smoothDelta.C b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
similarity index 100%
rename from src/LESmodels/LESdeltas/smoothDelta/smoothDelta.C
rename to src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
diff --git a/src/LESmodels/LESdeltas/smoothDelta/smoothDelta.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
similarity index 100%
rename from src/LESmodels/LESdeltas/smoothDelta/smoothDelta.H
rename to src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
diff --git a/src/LESmodels/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
similarity index 100%
rename from src/LESmodels/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
rename to src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
diff --git a/src/LESmodels/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
similarity index 100%
rename from src/LESmodels/LESfilters/LESfilter/LESfilter.C
rename to src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
diff --git a/src/LESmodels/LESfilters/LESfilter/LESfilter.H b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
similarity index 100%
rename from src/LESmodels/LESfilters/LESfilter/LESfilter.H
rename to src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
diff --git a/src/LESmodels/LESfilters/LESfilter/newFilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
similarity index 100%
rename from src/LESmodels/LESfilters/LESfilter/newFilter.C
rename to src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
diff --git a/src/LESmodels/LESfilters/Make/files b/src/turbulenceModels/LES/LESfilters/Make/files
similarity index 100%
rename from src/LESmodels/LESfilters/Make/files
rename to src/turbulenceModels/LES/LESfilters/Make/files
diff --git a/src/LESmodels/LESfilters/Make/options b/src/turbulenceModels/LES/LESfilters/Make/options
similarity index 100%
rename from src/LESmodels/LESfilters/Make/options
rename to src/turbulenceModels/LES/LESfilters/Make/options
diff --git a/src/LESmodels/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
similarity index 100%
rename from src/LESmodels/LESfilters/anisotropicFilter/anisotropicFilter.C
rename to src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
diff --git a/src/LESmodels/LESfilters/anisotropicFilter/anisotropicFilter.H b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
similarity index 100%
rename from src/LESmodels/LESfilters/anisotropicFilter/anisotropicFilter.H
rename to src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
diff --git a/src/LESmodels/LESfilters/laplaceFilter/laplaceFilter.C b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
similarity index 100%
rename from src/LESmodels/LESfilters/laplaceFilter/laplaceFilter.C
rename to src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
diff --git a/src/LESmodels/LESfilters/laplaceFilter/laplaceFilter.H b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
similarity index 100%
rename from src/LESmodels/LESfilters/laplaceFilter/laplaceFilter.H
rename to src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
diff --git a/src/LESmodels/LESfilters/simpleFilter/simpleFilter.C b/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C
similarity index 100%
rename from src/LESmodels/LESfilters/simpleFilter/simpleFilter.C
rename to src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C
diff --git a/src/LESmodels/LESfilters/simpleFilter/simpleFilter.H b/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
similarity index 100%
rename from src/LESmodels/LESfilters/simpleFilter/simpleFilter.H
rename to src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
diff --git a/src/LESmodels/compressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
similarity index 98%
rename from src/LESmodels/compressible/DeardorffDiffStress/DeardorffDiffStress.C
rename to src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
index 3cfd53504db..6b4b10032a5 100644
--- a/src/LESmodels/compressible/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
@@ -33,7 +33,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -127,7 +127,7 @@ bool DeardorffDiffStress::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
similarity index 98%
rename from src/LESmodels/compressible/DeardorffDiffStress/DeardorffDiffStress.H
rename to src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
index 45b0929f7d8..c184acc53ae 100644
--- a/src/LESmodels/compressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
@@ -62,7 +62,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -130,7 +130,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
similarity index 98%
rename from src/LESmodels/compressible/GenEddyVisc/GenEddyVisc.C
rename to src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
index 08d7d6cf978..d52caee3f9f 100644
--- a/src/LESmodels/compressible/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
@@ -32,7 +32,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -129,7 +129,7 @@ bool GenEddyVisc::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
similarity index 98%
rename from src/LESmodels/compressible/GenEddyVisc/GenEddyVisc.H
rename to src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
index 099b16fd865..d2d879d3a8e 100644
--- a/src/LESmodels/compressible/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
@@ -48,7 +48,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -144,7 +144,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
similarity index 98%
rename from src/LESmodels/compressible/GenSGSStress/GenSGSStress.C
rename to src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
index d1b565a9782..2c7dff7006e 100644
--- a/src/LESmodels/compressible/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
@@ -32,7 +32,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -144,7 +144,7 @@ bool GenSGSStress::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
similarity index 98%
rename from src/LESmodels/compressible/GenSGSStress/GenSGSStress.H
rename to src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
index 8035007e87b..384e49f50ed 100644
--- a/src/LESmodels/compressible/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
@@ -49,7 +49,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -149,7 +149,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
similarity index 100%
rename from src/LESmodels/compressible/LESmodel/LESmodel.C
rename to src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
diff --git a/src/LESmodels/compressible/LESmodel/LESmodel.H b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H
similarity index 100%
rename from src/LESmodels/compressible/LESmodel/LESmodel.H
rename to src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H
diff --git a/src/LESmodels/compressible/LESmodel/newLESmodel.C b/src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C
similarity index 100%
rename from src/LESmodels/compressible/LESmodel/newLESmodel.C
rename to src/turbulenceModels/LES/compressible/LESmodel/newLESmodel.C
diff --git a/src/LESmodels/compressible/Make/files b/src/turbulenceModels/LES/compressible/Make/files
similarity index 100%
rename from src/LESmodels/compressible/Make/files
rename to src/turbulenceModels/LES/compressible/Make/files
diff --git a/src/LESmodels/compressible/Make/options b/src/turbulenceModels/LES/compressible/Make/options
similarity index 68%
rename from src/LESmodels/compressible/Make/options
rename to src/turbulenceModels/LES/compressible/Make/options
index d0136196048..9f0da00e30d 100644
--- a/src/LESmodels/compressible/Make/options
+++ b/src/turbulenceModels/LES/compressible/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESfilters/lnInclude \
+ -I../LESdeltas/lnInclude \
+ -I../LESfilters/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \
diff --git a/src/LESmodels/compressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
similarity index 98%
rename from src/LESmodels/compressible/Smagorinsky/Smagorinsky.C
rename to src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
index 39828a9c030..7966b33e814 100644
--- a/src/LESmodels/compressible/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
@@ -33,7 +33,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -97,7 +97,7 @@ bool Smagorinsky::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
similarity index 98%
rename from src/LESmodels/compressible/Smagorinsky/Smagorinsky.H
rename to src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
index 94c530e1d5c..66a7f160fce 100644
--- a/src/LESmodels/compressible/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
@@ -58,7 +58,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -116,7 +116,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
similarity index 99%
rename from src/LESmodels/compressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
index df1f27f98ce..864f542fa3b 100644
--- a/src/LESmodels/compressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -241,7 +241,7 @@ bool SpalartAllmaras::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
similarity index 98%
rename from src/LESmodels/compressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
index b6e6074ae7c..79a8a4d7d39 100644
--- a/src/LESmodels/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
@@ -45,7 +45,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -163,7 +163,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
similarity index 98%
rename from src/LESmodels/compressible/dynOneEqEddy/dynOneEqEddy.C
rename to src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
index 8f3685453c2..0da469153e7 100644
--- a/src/LESmodels/compressible/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
@@ -33,7 +33,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -148,7 +148,7 @@ bool dynOneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
similarity index 98%
rename from src/LESmodels/compressible/dynOneEqEddy/dynOneEqEddy.H
rename to src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
index ea7fb7c04bf..6c6ec6cc340 100644
--- a/src/LESmodels/compressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
@@ -63,7 +63,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -135,7 +135,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
similarity index 98%
rename from src/LESmodels/compressible/lowReOneEqEddy/lowReOneEqEddy.C
rename to src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
index 07c594976a7..09494ac02e4 100644
--- a/src/LESmodels/compressible/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
@@ -33,7 +33,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -114,7 +114,7 @@ bool lowReOneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
similarity index 98%
rename from src/LESmodels/compressible/lowReOneEqEddy/lowReOneEqEddy.H
rename to src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
index 65f7b4f4169..a8fb1c8b6cc 100644
--- a/src/LESmodels/compressible/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
@@ -59,7 +59,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -127,7 +127,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
similarity index 98%
rename from src/LESmodels/compressible/oneEqEddy/oneEqEddy.C
rename to src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
index 00c0fbe96b2..f6d9a018116 100644
--- a/src/LESmodels/compressible/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
@@ -33,7 +33,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -109,7 +109,7 @@ bool oneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
similarity index 98%
rename from src/LESmodels/compressible/oneEqEddy/oneEqEddy.H
rename to src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
index 09455a825f9..850ce019b0e 100644
--- a/src/LESmodels/compressible/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
@@ -62,7 +62,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -130,7 +130,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
similarity index 99%
rename from src/LESmodels/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index 05924747bb2..b5d47a57304 100644
--- a/src/LESmodels/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
@@ -36,7 +36,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -191,7 +191,7 @@ makePatchTypeField(fvPatchScalarField, muSgsWallFunctionFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
similarity index 98%
rename from src/LESmodels/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
index 54d9ee302cd..29a52fca67c 100644
--- a/src/LESmodels/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
{
namespace compressible
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -148,7 +148,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace compressible
} // End namespace Foam
diff --git a/src/LESmodels/incompressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
similarity index 89%
rename from src/LESmodels/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
rename to src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
index 1a76b74acf9..e963a81f739 100644
--- a/src/LESmodels/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -91,12 +91,12 @@ void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
forAll(B_, celli)
{
- B_[celli].component(tensor::XX) =
- max(B_[celli].component(tensor::XX), k0().value());
- B_[celli].component(tensor::YY) =
- max(B_[celli].component(tensor::YY), k0().value());
- B_[celli].component(tensor::ZZ) =
- max(B_[celli].component(tensor::ZZ), k0().value());
+ B_[celli].component(symmTensor::XX) =
+ max(B_[celli].component(symmTensor::XX), k0().value());
+ B_[celli].component(symmTensor::YY) =
+ max(B_[celli].component(symmTensor::YY), k0().value());
+ B_[celli].component(symmTensor::ZZ) =
+ max(B_[celli].component(symmTensor::ZZ), k0().value());
}
K = 0.5*tr(B_);
@@ -125,7 +125,7 @@ bool DeardorffDiffStress::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
similarity index 98%
rename from src/LESmodels/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
rename to src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
index d7b2d06b6ec..54138e0df3e 100644
--- a/src/LESmodels/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
@@ -60,7 +60,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -127,7 +127,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
similarity index 98%
rename from src/LESmodels/incompressible/GenEddyVisc/GenEddyVisc.C
rename to src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
index ad6f1db5c27..4087e215456 100644
--- a/src/LESmodels/incompressible/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
@@ -30,7 +30,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -109,7 +109,7 @@ bool GenEddyVisc::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
similarity index 98%
rename from src/LESmodels/incompressible/GenEddyVisc/GenEddyVisc.H
rename to src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
index b66f5da2405..62cf67dc1c7 100644
--- a/src/LESmodels/incompressible/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
@@ -46,7 +46,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -128,7 +128,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
similarity index 98%
rename from src/LESmodels/incompressible/GenSGSStress/GenSGSStress.C
rename to src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
index 9eee42fa26a..f06fe00f53f 100644
--- a/src/LESmodels/incompressible/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
@@ -30,7 +30,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -173,7 +173,7 @@ bool GenSGSStress::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
similarity index 98%
rename from src/LESmodels/incompressible/GenSGSStress/GenSGSStress.H
rename to src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
index 297a06d352e..98f31d6aa87 100644
--- a/src/LESmodels/incompressible/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
@@ -47,7 +47,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -136,7 +136,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
similarity index 100%
rename from src/LESmodels/incompressible/LESmodel/LESmodel.C
rename to src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
diff --git a/src/LESmodels/incompressible/LESmodel/LESmodel.H b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H
similarity index 100%
rename from src/LESmodels/incompressible/LESmodel/LESmodel.H
rename to src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.H
diff --git a/src/LESmodels/incompressible/LESmodel/newLESmodel.C b/src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C
similarity index 100%
rename from src/LESmodels/incompressible/LESmodel/newLESmodel.C
rename to src/turbulenceModels/LES/incompressible/LESmodel/newLESmodel.C
diff --git a/src/LESmodels/incompressible/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
similarity index 98%
rename from src/LESmodels/incompressible/LRRDiffStress/LRRDiffStress.C
rename to src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
index 1ae232f295f..544727b8acb 100644
--- a/src/LESmodels/incompressible/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -128,7 +128,7 @@ bool LRRDiffStress::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
similarity index 98%
rename from src/LESmodels/incompressible/LRRDiffStress/LRRDiffStress.H
rename to src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
index b9be9320791..f9e5c057b82 100644
--- a/src/LESmodels/incompressible/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
@@ -58,7 +58,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -126,7 +126,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/Make/files b/src/turbulenceModels/LES/incompressible/Make/files
similarity index 100%
rename from src/LESmodels/incompressible/Make/files
rename to src/turbulenceModels/LES/incompressible/Make/files
diff --git a/src/LESmodels/incompressible/Make/options b/src/turbulenceModels/LES/incompressible/Make/options
similarity index 56%
rename from src/LESmodels/incompressible/Make/options
rename to src/turbulenceModels/LES/incompressible/Make/options
index 0db4c249611..a2991710f1c 100644
--- a/src/LESmodels/incompressible/Make/options
+++ b/src/turbulenceModels/LES/incompressible/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
- -I$(LIB_SRC)/LESmodels/LESfilters/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I../LESdeltas/lnInclude \
+ -I../LESfilters/lnInclude \
-I$(LIB_SRC)/transportModels
LIB_LIBS = \
diff --git a/src/LESmodels/incompressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
similarity index 98%
rename from src/LESmodels/incompressible/Smagorinsky/Smagorinsky.C
rename to src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
index 706812439eb..ff626ed7b6b 100644
--- a/src/LESmodels/incompressible/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -83,7 +83,7 @@ bool Smagorinsky::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
similarity index 98%
rename from src/LESmodels/incompressible/Smagorinsky/Smagorinsky.H
rename to src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
index bcedf4cd95d..9464b9b4810 100644
--- a/src/LESmodels/incompressible/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
@@ -57,7 +57,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -128,7 +128,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
similarity index 98%
rename from src/LESmodels/incompressible/Smagorinsky2/Smagorinsky2.C
rename to src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
index 7ca2395725c..dbb8dbce91d 100644
--- a/src/LESmodels/incompressible/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -107,7 +107,7 @@ bool Smagorinsky2::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
similarity index 98%
rename from src/LESmodels/incompressible/Smagorinsky2/Smagorinsky2.H
rename to src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
index 7fd2a59d78b..3a682680fe9 100644
--- a/src/LESmodels/incompressible/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
@@ -56,7 +56,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -118,7 +118,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
similarity index 99%
rename from src/LESmodels/incompressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
index 5c8c25bd4eb..add91b8fb32 100644
--- a/src/LESmodels/incompressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
@@ -32,7 +32,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -237,7 +237,7 @@ bool SpalartAllmaras::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
similarity index 98%
rename from src/LESmodels/incompressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
index c36143e9d78..459a9ab9dba 100644
--- a/src/LESmodels/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
@@ -43,7 +43,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -152,7 +152,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
similarity index 98%
rename from src/LESmodels/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
rename to src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
index 0718ee02204..f8eb662e2fc 100644
--- a/src/LESmodels/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
+++ b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -133,7 +133,7 @@ bool dynMixedSmagorinsky::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
similarity index 98%
rename from src/LESmodels/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
rename to src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 40bedf4243d..b25ae74b621 100644
--- a/src/LESmodels/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -68,7 +68,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -137,7 +137,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
similarity index 98%
rename from src/LESmodels/incompressible/dynOneEqEddy/dynOneEqEddy.C
rename to src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
index 570aa08b542..4c397782163 100644
--- a/src/LESmodels/incompressible/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -172,7 +172,7 @@ bool dynOneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
similarity index 98%
rename from src/LESmodels/incompressible/dynOneEqEddy/dynOneEqEddy.H
rename to src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
index 8618c220ad9..84c81802337 100644
--- a/src/LESmodels/incompressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
@@ -64,7 +64,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -142,7 +142,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
similarity index 98%
rename from src/LESmodels/incompressible/dynSmagorinsky/dynSmagorinsky.C
rename to src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
index ca03a7fd00e..85802cd231a 100644
--- a/src/LESmodels/incompressible/dynSmagorinsky/dynSmagorinsky.C
+++ b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -152,7 +152,7 @@ bool dynSmagorinsky::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
similarity index 98%
rename from src/LESmodels/incompressible/dynSmagorinsky/dynSmagorinsky.H
rename to src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
index ccdbf5b48a2..f4d44cf6e65 100644
--- a/src/LESmodels/incompressible/dynSmagorinsky/dynSmagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
@@ -73,7 +73,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -142,7 +142,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/laminar/laminar.C b/src/turbulenceModels/LES/incompressible/laminar/laminar.C
similarity index 98%
rename from src/LESmodels/incompressible/laminar/laminar.C
rename to src/turbulenceModels/LES/incompressible/laminar/laminar.C
index 5d55ee8aeae..92389fa94a6 100644
--- a/src/LESmodels/incompressible/laminar/laminar.C
+++ b/src/turbulenceModels/LES/incompressible/laminar/laminar.C
@@ -32,7 +32,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -157,7 +157,7 @@ bool laminar::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/laminar/laminar.H b/src/turbulenceModels/LES/incompressible/laminar/laminar.H
similarity index 98%
rename from src/LESmodels/incompressible/laminar/laminar.H
rename to src/turbulenceModels/LES/incompressible/laminar/laminar.H
index c65e7789e93..e4dc2fe2522 100644
--- a/src/LESmodels/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/LES/incompressible/laminar/laminar.H
@@ -44,7 +44,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -117,7 +117,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
similarity index 98%
rename from src/LESmodels/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
rename to src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
index a394c814e1f..95c48f7fc7c 100644
--- a/src/LESmodels/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
+++ b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -163,7 +163,7 @@ bool locDynOneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
similarity index 98%
rename from src/LESmodels/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
rename to src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
index 391026bea5e..8296e45f10b 100644
--- a/src/LESmodels/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
@@ -72,7 +72,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -160,7 +160,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
similarity index 98%
rename from src/LESmodels/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
rename to src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
index 338143a5a6e..e9f7093ef3b 100644
--- a/src/LESmodels/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
+++ b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -136,7 +136,7 @@ bool mixedSmagorinsky::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
similarity index 98%
rename from src/LESmodels/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
rename to src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
index 1cd7115f21e..f6d95f3ee98 100644
--- a/src/LESmodels/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
@@ -67,7 +67,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -143,7 +143,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
similarity index 98%
rename from src/LESmodels/incompressible/oneEqEddy/oneEqEddy.C
rename to src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
index 81b605d86c2..828d43ceddf 100644
--- a/src/LESmodels/incompressible/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -112,7 +112,7 @@ bool oneEqEddy::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
similarity index 98%
rename from src/LESmodels/incompressible/oneEqEddy/oneEqEddy.H
rename to src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
index a5469960159..ea6395c0919 100644
--- a/src/LESmodels/incompressible/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
@@ -61,7 +61,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -135,7 +135,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
similarity index 98%
rename from src/LESmodels/incompressible/scaleSimilarity/scaleSimilarity.C
rename to src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
index 56e0b5d3165..fab13467a9e 100644
--- a/src/LESmodels/incompressible/scaleSimilarity/scaleSimilarity.C
+++ b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
@@ -30,7 +30,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -115,7 +115,7 @@ bool scaleSimilarity::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
similarity index 98%
rename from src/LESmodels/incompressible/scaleSimilarity/scaleSimilarity.H
rename to src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
index f909228f2b2..71f8f3b4cc6 100644
--- a/src/LESmodels/incompressible/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
@@ -47,7 +47,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -121,7 +121,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
similarity index 98%
rename from src/LESmodels/incompressible/spectEddyVisc/spectEddyVisc.C
rename to src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
index edad7876e1c..da16b1a604b 100644
--- a/src/LESmodels/incompressible/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -117,7 +117,7 @@ bool spectEddyVisc::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
similarity index 98%
rename from src/LESmodels/incompressible/spectEddyVisc/spectEddyVisc.H
rename to src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
index 2543b835fd4..928798d406b 100644
--- a/src/LESmodels/incompressible/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
@@ -61,7 +61,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -125,7 +125,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
similarity index 98%
rename from src/LESmodels/incompressible/vanDriestDelta/vanDriestDelta.C
rename to src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
index bdc974b2c03..a6333250226 100644
--- a/src/LESmodels/incompressible/vanDriestDelta/vanDriestDelta.C
+++ b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
@@ -35,7 +35,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -143,7 +143,7 @@ void vanDriestDelta::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
similarity index 98%
rename from src/LESmodels/incompressible/vanDriestDelta/vanDriestDelta.H
rename to src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
index 98302062c64..ff96b5aaf53 100644
--- a/src/LESmodels/incompressible/vanDriestDelta/vanDriestDelta.H
+++ b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
@@ -42,7 +42,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -101,7 +101,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/LESmodels/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
similarity index 99%
rename from src/LESmodels/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index e8ec8c7b9f9..1c39967b7eb 100644
--- a/src/LESmodels/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
-namespace LESmodels
+namespace LES
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -171,7 +171,7 @@ makePatchTypeField(fvPatchScalarField, nuSgsWallFunctionFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/LESmodels/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
similarity index 98%
rename from src/LESmodels/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index 66297125eb4..5bf9968fe5a 100644
--- a/src/LESmodels/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
@@ -42,7 +42,7 @@ SourceFiles
namespace Foam
{
-namespace LESmodels
+namespace LES
{
/*---------------------------------------------------------------------------*\
@@ -138,7 +138,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace LESmodels
+} // End namespace LES
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/RAS/Allwmake b/src/turbulenceModels/RAS/Allwmake
new file mode 100755
index 00000000000..5ccba2b371a
--- /dev/null
+++ b/src/turbulenceModels/RAS/Allwmake
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -x
+
+wmake libso incompressible
+wmake libso compressible
diff --git a/src/turbulenceModels/compressible/LRR/LRR.C b/src/turbulenceModels/RAS/compressible/LRR/LRR.C
similarity index 99%
rename from src/turbulenceModels/compressible/LRR/LRR.C
rename to src/turbulenceModels/RAS/compressible/LRR/LRR.C
index abcb8e08a89..6127a63e3f2 100644
--- a/src/turbulenceModels/compressible/LRR/LRR.C
+++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -366,7 +366,7 @@ void LRR::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/LRR/LRR.H b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
similarity index 97%
rename from src/turbulenceModels/compressible/LRR/LRR.H
rename to src/turbulenceModels/RAS/compressible/LRR/LRR.H
index d095a087078..3ac8c47a006 100644
--- a/src/turbulenceModels/compressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::LRR
+ Foam::compressible::RAS::LRR
Description
Launder, Reece and Rodi Reynolds-stress turbulence model for
@@ -46,7 +46,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -172,7 +172,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
similarity index 99%
rename from src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
rename to src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index af49d94b98b..d7bac108dea 100644
--- a/src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -36,7 +36,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -390,7 +390,7 @@ void LaunderGibsonRSTM::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
similarity index 97%
rename from src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
rename to src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 3a9bec06798..c6e9128711e 100644
--- a/src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::LaunderGibsonRSTM
+ Foam::compressible::RAS::LaunderGibsonRSTM
Description
Launder-Gibson Reynolds stress turbulence model for compressible flows.
@@ -46,7 +46,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -179,7 +179,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
similarity index 99%
rename from src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.C
rename to src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
index ed86a5e8859..90ff2b01c2f 100644
--- a/src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -270,7 +270,7 @@ void LaunderSharmaKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
similarity index 97%
rename from src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.H
rename to src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
index 1bfb5eecd23..07eda8047b5 100644
--- a/src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::LaunderSharmaKE
+ Foam::compressible::RAS::LaunderSharmaKE
Description
Launder and Sharma low-Reynolds k-epsilon turbulence model for
@@ -46,7 +46,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -166,7 +166,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/LaunderSharmaKE/sourceFiles b/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/sourceFiles
similarity index 100%
rename from src/turbulenceModels/compressible/LaunderSharmaKE/sourceFiles
rename to src/turbulenceModels/RAS/compressible/LaunderSharmaKE/sourceFiles
diff --git a/src/turbulenceModels/compressible/Make/files b/src/turbulenceModels/RAS/compressible/Make/files
similarity index 100%
rename from src/turbulenceModels/compressible/Make/files
rename to src/turbulenceModels/RAS/compressible/Make/files
diff --git a/src/turbulenceModels/compressible/Make/options b/src/turbulenceModels/RAS/compressible/Make/options
similarity index 100%
rename from src/turbulenceModels/compressible/Make/options
rename to src/turbulenceModels/RAS/compressible/Make/options
diff --git a/src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
similarity index 99%
rename from src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.C
rename to src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
index d13d4ff1d3a..072e8d65e37 100644
--- a/src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -267,7 +267,7 @@ void RNGkEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
similarity index 97%
rename from src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.H
rename to src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
index f3e5c31c9f9..3d70f721a55 100644
--- a/src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::RNGkEpsilon
+ Foam::compressible::RAS::RNGkEpsilon
Description
Renormalisation group k-epsilon turbulence model for compressible flows.
@@ -45,7 +45,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -161,7 +161,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/RNGkEpsilon/sourceFiles b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/sourceFiles
similarity index 100%
rename from src/turbulenceModels/compressible/RNGkEpsilon/sourceFiles
rename to src/turbulenceModels/RAS/compressible/RNGkEpsilon/sourceFiles
diff --git a/src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
similarity index 99%
rename from src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
index 802a63c8c93..d6bd52b61a9 100644
--- a/src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -285,7 +285,7 @@ void SpalartAllmaras::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
similarity index 98%
rename from src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
index fbb1761d20b..08b41ddb115 100644
--- a/src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::SpalartAllmaras
+ Foam::compressible::RAS::SpalartAllmaras
Description
Spalart-Allmaras one-eqn mixing-length model for compressible
@@ -62,7 +62,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -215,7 +215,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
similarity index 99%
rename from src/turbulenceModels/compressible/kEpsilon/kEpsilon.C
rename to src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
index e77192b006e..6545b763d90 100644
--- a/src/turbulenceModels/compressible/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -257,7 +257,7 @@ void kEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
similarity index 97%
rename from src/turbulenceModels/compressible/kEpsilon/kEpsilon.H
rename to src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
index f88830349a7..3a58da60b33 100644
--- a/src/turbulenceModels/compressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::kEpsilon
+ Foam::compressible::RAS::kEpsilon
Description
Standard k-epsilon turbulence model for compressible flows
@@ -45,7 +45,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -164,7 +164,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
similarity index 100%
rename from src/turbulenceModels/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
rename to src/turbulenceModels/RAS/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
diff --git a/src/turbulenceModels/compressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
similarity index 99%
rename from src/turbulenceModels/compressible/kOmegaSST/kOmegaSST.C
rename to src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
index b9b511d839e..3369960b4fb 100644
--- a/src/turbulenceModels/compressible/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -348,7 +348,7 @@ void kOmegaSST::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
similarity index 98%
rename from src/turbulenceModels/compressible/kOmegaSST/kOmegaSST.H
rename to src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
index b0a4905fa03..717403d3e83 100644
--- a/src/turbulenceModels/compressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::kOmegaSST
+ Foam::compressible::RAS::kOmegaSST
Description
Implementation of the k-omega-SST turbulence model for compressible flows.
@@ -72,7 +72,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -271,7 +271,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/kOmegaSST/kOmegaWallFunctionsI.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallFunctionsI.H
similarity index 100%
rename from src/turbulenceModels/compressible/kOmegaSST/kOmegaWallFunctionsI.H
rename to src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallFunctionsI.H
diff --git a/src/turbulenceModels/compressible/kOmegaSST/kOmegaWallViscosityI.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallViscosityI.H
similarity index 100%
rename from src/turbulenceModels/compressible/kOmegaSST/kOmegaWallViscosityI.H
rename to src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallViscosityI.H
diff --git a/src/turbulenceModels/compressible/kOmegaSST/wallOmegaI.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/wallOmegaI.H
similarity index 100%
rename from src/turbulenceModels/compressible/kOmegaSST/wallOmegaI.H
rename to src/turbulenceModels/RAS/compressible/kOmegaSST/wallOmegaI.H
diff --git a/src/turbulenceModels/compressible/laminar/laminar.C b/src/turbulenceModels/RAS/compressible/laminar/laminar.C
similarity index 98%
rename from src/turbulenceModels/compressible/laminar/laminar.C
rename to src/turbulenceModels/RAS/compressible/laminar/laminar.C
index 0a576c96ec7..291f40e5855 100644
--- a/src/turbulenceModels/compressible/laminar/laminar.C
+++ b/src/turbulenceModels/RAS/compressible/laminar/laminar.C
@@ -33,7 +33,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -188,7 +188,7 @@ void laminar::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/laminar/laminar.H b/src/turbulenceModels/RAS/compressible/laminar/laminar.H
similarity index 97%
rename from src/turbulenceModels/compressible/laminar/laminar.H
rename to src/turbulenceModels/RAS/compressible/laminar/laminar.H
index e3c062878fe..31efee8b39e 100644
--- a/src/turbulenceModels/compressible/laminar/laminar.H
+++ b/src/turbulenceModels/RAS/compressible/laminar/laminar.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::laminar
+ Foam::compressible::RAS::laminar
Description
Dummy turbulence model for laminar compressible flow.
@@ -45,7 +45,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -124,7 +124,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
similarity index 99%
rename from src/turbulenceModels/compressible/realizableKE/realizableKE.C
rename to src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
index e330ca3c210..f7aa5b9fef4 100644
--- a/src/turbulenceModels/compressible/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
@@ -34,7 +34,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -302,7 +302,7 @@ void realizableKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
similarity index 97%
rename from src/turbulenceModels/compressible/realizableKE/realizableKE.H
rename to src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
index 73e64b2bb46..d8f1d10e11b 100644
--- a/src/turbulenceModels/compressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::realizableKE
+ Foam::compressible::RAS::realizableKE
Description
Realizable k-epsilon turbulence model for compressible flows.
@@ -55,7 +55,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -179,7 +179,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/turbulenceModel/newTurbulenceModel.C b/src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C
similarity index 100%
rename from src/turbulenceModels/compressible/turbulenceModel/newTurbulenceModel.C
rename to src/turbulenceModels/RAS/compressible/turbulenceModel/newTurbulenceModel.C
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
similarity index 100%
rename from src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
rename to src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H
similarity index 98%
rename from src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
rename to src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H
index 5036bff2067..d0a3b2ae1a9 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.H
@@ -23,10 +23,10 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Namespace
- Foam::compressible::turbulenceModels
+ Foam::compressible::RAS
Description
- Namespace for compressible turbulence models.
+ Namespace for compressible RAS turbulence models.
Class
diff --git a/src/turbulenceModels/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
similarity index 99%
rename from src/turbulenceModels/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
index 3c694027504..64d45abbdfe 100644
--- a/src/turbulenceModels/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
@@ -36,7 +36,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -304,7 +304,7 @@ makePatchTypeField
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
similarity index 97%
rename from src/turbulenceModels/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
index faba6f3e972..081f68ae676 100644
--- a/src/turbulenceModels/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::compressible::turbulenceModels::mutStandardRoughWallFunctionFvPatchScalarField
+ Foam::compressible::RAS::mutStandardRoughWallFunctionFvPatchScalarField
Description
Wall function boundary condition for rough walls
@@ -44,7 +44,7 @@ namespace Foam
{
namespace compressible
{
-namespace turbulenceModels
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -189,7 +189,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
} // End namespace compressible
} // End namespace Foam
diff --git a/src/turbulenceModels/compressible/wallFunctions/wallDissipationI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallDissipationI.H
similarity index 100%
rename from src/turbulenceModels/compressible/wallFunctions/wallDissipationI.H
rename to src/turbulenceModels/RAS/compressible/wallFunctions/wallDissipationI.H
diff --git a/src/turbulenceModels/compressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
similarity index 100%
rename from src/turbulenceModels/compressible/wallFunctions/wallFunctionsI.H
rename to src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
diff --git a/src/turbulenceModels/compressible/wallFunctions/wallViscosityI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
similarity index 100%
rename from src/turbulenceModels/compressible/wallFunctions/wallViscosityI.H
rename to src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
diff --git a/src/turbulenceModels/incompressible/LRR/LRR.C b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C
similarity index 98%
rename from src/turbulenceModels/incompressible/LRR/LRR.C
rename to src/turbulenceModels/RAS/incompressible/LRR/LRR.C
index ac1fa841b1c..1151255d8b2 100644
--- a/src/turbulenceModels/incompressible/LRR/LRR.C
+++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -346,7 +348,8 @@ void LRR::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LRR/LRR.H b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
similarity index 96%
rename from src/turbulenceModels/incompressible/LRR/LRR.H
rename to src/turbulenceModels/RAS/incompressible/LRR/LRR.H
index bcc6c119d58..e4c8c9f338f 100644
--- a/src/turbulenceModels/incompressible/LRR/LRR.H
+++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LRR
+ Foam::incompressible::RAS::LRR
Description
Launder, Reece and Rodi Reynolds-stress turbulence model for
@@ -43,7 +43,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -157,7 +159,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
similarity index 98%
rename from src/turbulenceModels/incompressible/LamBremhorstKE/LamBremhorstKE.C
rename to src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
index 02921cc661e..eaa3da29846 100644
--- a/src/turbulenceModels/incompressible/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
@@ -31,7 +31,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -242,7 +244,8 @@ void LamBremhorstKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
similarity index 96%
rename from src/turbulenceModels/incompressible/LamBremhorstKE/LamBremhorstKE.H
rename to src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
index b78998d6ce7..4a9f48ecd45 100644
--- a/src/turbulenceModels/incompressible/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LamBremhorstKE
+ Foam::incompressible::RAS::LamBremhorstKE
Description
Lam and Bremhorst low-Reynolds number k-epsilon turbulence model
@@ -44,7 +44,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -152,7 +154,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
similarity index 99%
rename from src/turbulenceModels/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
rename to src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 3aaaa93f9e6..d2fb24cde52 100644
--- a/src/turbulenceModels/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -369,7 +371,8 @@ void LaunderGibsonRSTM::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
similarity index 96%
rename from src/turbulenceModels/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
rename to src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 5ca442e79e5..82ea6ae7d5a 100644
--- a/src/turbulenceModels/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LaunderGibsonRSTM
+ Foam::incompressible::RAS::LaunderGibsonRSTM
Description
Launder-Gibson Reynolds stress turbulence model for incompressible flows.
@@ -43,7 +43,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -163,7 +165,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
similarity index 98%
rename from src/turbulenceModels/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
rename to src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
index 26083398642..edf6c03051f 100644
--- a/src/turbulenceModels/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
@@ -31,7 +31,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -237,7 +239,8 @@ void LaunderSharmaKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
similarity index 96%
rename from src/turbulenceModels/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
rename to src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
index f83fa6fdac5..befc3a589b7 100644
--- a/src/turbulenceModels/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LaunderSharmaKE
+ Foam::incompressible::RAS::LaunderSharmaKE
Description
Launder and Sharma low-Reynolds k-epsilon turbulence model for
@@ -43,7 +43,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -153,7 +155,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
similarity index 98%
rename from src/turbulenceModels/incompressible/LienCubicKE/LienCubicKE.C
rename to src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
index 4390541ffd8..3050ca0c1bc 100644
--- a/src/turbulenceModels/incompressible/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -319,7 +321,8 @@ void LienCubicKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
similarity index 96%
rename from src/turbulenceModels/incompressible/LienCubicKE/LienCubicKE.H
rename to src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
index cdcfe24a27f..4b1a061df7e 100644
--- a/src/turbulenceModels/incompressible/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LienCubicKE
+ Foam::incompressible::RAS::LienCubicKE
Description
Lien cubic non-linear k-epsilon turbulence model for incompressible flows.
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -160,7 +162,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
similarity index 99%
rename from src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
rename to src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
index 662de4fd488..96cae224686 100644
--- a/src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -380,7 +382,8 @@ void LienCubicKELowRe::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
similarity index 97%
rename from src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
rename to src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
index 445799b4285..17e2dbfacb5 100644
--- a/src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LienCubicKELowRe
+ Foam::incompressible::RAS::LienCubicKELowRe
Description
Lien cubic non-linear low-Reynolds k-epsilon turbulence models for
@@ -58,7 +58,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -185,7 +187,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // Edn namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H b/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
similarity index 100%
rename from src/turbulenceModels/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
rename to src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
diff --git a/src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
similarity index 98%
rename from src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
rename to src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index dba79ad54ee..8f9b218d1d3 100644
--- a/src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -269,7 +271,8 @@ void LienLeschzinerLowRe::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
similarity index 96%
rename from src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
rename to src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index f921fe6fc81..effce00a165 100644
--- a/src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::LienLeschzinerLowRe
+ Foam::incompressible::RAS::LienLeschzinerLowRe
Description
Lien and Leschziner low-Reynolds k-epsilon turbulence model for
@@ -44,7 +44,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -155,7 +157,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H b/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
similarity index 100%
rename from src/turbulenceModels/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
rename to src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
diff --git a/src/turbulenceModels/incompressible/Make/files b/src/turbulenceModels/RAS/incompressible/Make/files
similarity index 100%
rename from src/turbulenceModels/incompressible/Make/files
rename to src/turbulenceModels/RAS/incompressible/Make/files
diff --git a/src/turbulenceModels/incompressible/Make/options b/src/turbulenceModels/RAS/incompressible/Make/options
similarity index 100%
rename from src/turbulenceModels/incompressible/Make/options
rename to src/turbulenceModels/RAS/incompressible/Make/options
diff --git a/src/turbulenceModels/incompressible/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
similarity index 98%
rename from src/turbulenceModels/incompressible/NonlinearKEShih/NonlinearKEShih.C
rename to src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
index ac432e46184..8001d707c74 100644
--- a/src/turbulenceModels/incompressible/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -294,7 +296,8 @@ void NonlinearKEShih::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
similarity index 96%
rename from src/turbulenceModels/incompressible/NonlinearKEShih/NonlinearKEShih.H
rename to src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
index 5a820e9a211..f8e5973a647 100644
--- a/src/turbulenceModels/incompressible/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::NonlinearKEShih
+ Foam::incompressible::RAS::NonlinearKEShih
Description
Shih's quadratic non-linear k-epsilon turbulence model for
@@ -43,7 +43,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -159,7 +161,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/QZeta/QZeta.C b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
similarity index 98%
rename from src/turbulenceModels/incompressible/QZeta/QZeta.C
rename to src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
index 27198fef05d..d10559ccdec 100644
--- a/src/turbulenceModels/incompressible/QZeta/QZeta.C
+++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
@@ -31,7 +31,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -291,7 +293,8 @@ void QZeta::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/QZeta/QZeta.H b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
similarity index 97%
rename from src/turbulenceModels/incompressible/QZeta/QZeta.H
rename to src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
index 7ad93af896d..5e9d6953f07 100644
--- a/src/turbulenceModels/incompressible/QZeta/QZeta.H
+++ b/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::QZeta
+ Foam::incompressible::RAS::QZeta
Description
Gibson and Dafa'Alla's q-zeta two-equation low-Re turbulence model
@@ -43,7 +43,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -166,7 +168,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
similarity index 98%
rename from src/turbulenceModels/incompressible/RNGkEpsilon/RNGkEpsilon.C
rename to src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
index 6da8e707cca..5ec48b1ed52 100644
--- a/src/turbulenceModels/incompressible/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -238,7 +240,8 @@ void RNGkEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
similarity index 96%
rename from src/turbulenceModels/incompressible/RNGkEpsilon/RNGkEpsilon.H
rename to src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
index 307c9b72199..47df99ac8cf 100644
--- a/src/turbulenceModels/incompressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::RNGkEpsilon
+ Foam::incompressible::RAS::RNGkEpsilon
Description
Renormalisation group k-epsilon turbulence model for incompressible flows.
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -147,7 +149,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
similarity index 98%
rename from src/turbulenceModels/incompressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
index 197da2eee5c..c6237654646 100644
--- a/src/turbulenceModels/incompressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -325,7 +327,8 @@ void SpalartAllmaras::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
similarity index 96%
rename from src/turbulenceModels/incompressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
index ef0be3c3bee..6ad20dbe13e 100644
--- a/src/turbulenceModels/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::SpalartAllmaras
+ Foam::incompressible::RAS::SpalartAllmaras
Description
Spalart-Allmaras 1-eqn mixing-length model for incompressible external
@@ -59,7 +59,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -164,7 +166,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
similarity index 98%
rename from src/turbulenceModels/incompressible/kEpsilon/kEpsilon.C
rename to src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
index fa55f6b7026..524649e8f3d 100644
--- a/src/turbulenceModels/incompressible/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -227,7 +229,8 @@ void kEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
similarity index 96%
rename from src/turbulenceModels/incompressible/kEpsilon/kEpsilon.H
rename to src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
index 9c80f45af95..697edabc2f1 100644
--- a/src/turbulenceModels/incompressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::kEpsilon
+ Foam::incompressible::RAS::kEpsilon
Description
Standard k-epsilon turbulence model for incompressible flows.
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -149,7 +151,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
similarity index 100%
rename from src/turbulenceModels/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
rename to src/turbulenceModels/RAS/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
diff --git a/src/turbulenceModels/incompressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
similarity index 98%
rename from src/turbulenceModels/incompressible/kOmegaSST/kOmegaSST.C
rename to src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
index 0530b4f2fc3..a2d6838b28f 100644
--- a/src/turbulenceModels/incompressible/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -323,7 +325,8 @@ void kOmegaSST::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
similarity index 98%
rename from src/turbulenceModels/incompressible/kOmegaSST/kOmegaSST.H
rename to src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
index c4b9bbd90e9..0672ed3f394 100644
--- a/src/turbulenceModels/incompressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::kOmegaSST
+ Foam::incompressible::RAS::kOmegaSST
Description
Implementation of the k-omega-SST turbulence model for incompressible
@@ -71,7 +71,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -259,7 +261,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/kOmegaSST/kOmegaWallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallFunctionsI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/kOmegaSST/kOmegaWallFunctionsI.H
rename to src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallFunctionsI.H
diff --git a/src/turbulenceModels/incompressible/kOmegaSST/kOmegaWallViscosityI.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallViscosityI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/kOmegaSST/kOmegaWallViscosityI.H
rename to src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallViscosityI.H
diff --git a/src/turbulenceModels/incompressible/kOmegaSST/wallOmegaI.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/wallOmegaI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/kOmegaSST/wallOmegaI.H
rename to src/turbulenceModels/RAS/incompressible/kOmegaSST/wallOmegaI.H
diff --git a/src/turbulenceModels/incompressible/laminar/laminar.C b/src/turbulenceModels/RAS/incompressible/laminar/laminar.C
similarity index 97%
rename from src/turbulenceModels/incompressible/laminar/laminar.C
rename to src/turbulenceModels/RAS/incompressible/laminar/laminar.C
index 23096bae43e..931adedc68e 100644
--- a/src/turbulenceModels/incompressible/laminar/laminar.C
+++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.C
@@ -31,7 +31,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -194,7 +196,8 @@ void laminar::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/laminar/laminar.H b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
similarity index 96%
rename from src/turbulenceModels/incompressible/laminar/laminar.H
rename to src/turbulenceModels/RAS/incompressible/laminar/laminar.H
index 60ec7e3e3d3..e29ac76b495 100644
--- a/src/turbulenceModels/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::laminar
+ Foam::incompressible::RAS::laminar
Description
Dummy turbulence model for laminar incompressible flow.
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -110,7 +112,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
similarity index 98%
rename from src/turbulenceModels/incompressible/realizableKE/realizableKE.C
rename to src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
index 84da5614448..132a7b84cb4 100644
--- a/src/turbulenceModels/incompressible/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
@@ -32,7 +32,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -283,7 +285,8 @@ void realizableKE::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/realizableKE/realizableKE.H b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
similarity index 97%
rename from src/turbulenceModels/incompressible/realizableKE/realizableKE.H
rename to src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
index d6e9f62f806..41c15c9ee59 100644
--- a/src/turbulenceModels/incompressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::realizableKE
+ Foam::incompressible::RAS::realizableKE
Description
Realizable k-epsilon turbulence model for incompressible flows.
@@ -54,7 +54,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -168,7 +170,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C b/src/turbulenceModels/RAS/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C
similarity index 100%
rename from src/turbulenceModels/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C
rename to src/turbulenceModels/RAS/incompressible/turbulenceModel/checkIncompressibleTurbulenceModelsLock.C
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/newTurbulenceModel.C b/src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C
similarity index 98%
rename from src/turbulenceModels/incompressible/turbulenceModel/newTurbulenceModel.C
rename to src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C
index bed073afa83..6b060f9419d 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/newTurbulenceModel.C
+++ b/src/turbulenceModels/RAS/incompressible/turbulenceModel/newTurbulenceModel.C
@@ -32,6 +32,8 @@ License
namespace Foam
{
+namespace incompressible
+{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -88,6 +90,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
similarity index 98%
rename from src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
rename to src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
index 3f1e371f963..7c157e8940e 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
@@ -31,6 +31,8 @@ License
namespace Foam
{
+namespace incompressible
+{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -197,6 +199,7 @@ bool turbulenceModel::read()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H
similarity index 97%
rename from src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
rename to src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H
index a8bd512763b..aaeb320f1de 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.H
@@ -23,14 +23,13 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Namespace
- Foam::turbulenceModels
+ Foam::incompressible
Description
- Namespace for incompressible turbulence models.
-
+ Namespace for incompressible RAS turbulence models.
Class
- Foam::turbulenceModel
+ Foam::incompressible::turbulenceModel
Description
Abstract base class for incompressible turbulence models.
@@ -61,6 +60,8 @@ SourceFiles
namespace Foam
{
+namespace incompressible
+{
/*---------------------------------------------------------------------------*\
Class turbulenceModel Declaration
@@ -277,6 +278,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nonLinearWallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nonLinearWallFunctionsI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/wallFunctions/nonLinearWallFunctionsI.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nonLinearWallFunctionsI.H
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
similarity index 97%
rename from src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
index 90553c84662..ac6cfb35ec3 100644
--- a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
@@ -34,7 +34,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -128,13 +130,13 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
// The reciprical of the distance to the adjacent cell centre.
const scalarField& ry = patch().deltaCoeffs();
- const fvPatchVectorField& U =
+ const fvPatchVectorField& U =
patch().lookupPatchField<volVectorField, vector>("U");
// The flow velocity at the adjacent cell centre.
scalarField magUp = mag(U.patchInternalField() - U);
- const scalarField& nuw =
+ const scalarField& nuw =
patch().lookupPatchField<volScalarField, scalar>("nu");
scalarField& nutw = *this;
@@ -150,7 +152,7 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
//if (KsPlusBasedOnYPlus_)
{
- // If KsPlus is based on YPlus the extra term added to the law
+ // If KsPlus is based on YPlus the extra term added to the law
// of the wall will depend on yPlus.
forAll(nutw, facei)
{
@@ -201,7 +203,7 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
const scalar sint_2 = sin(t_2);
const scalar logt_1 = log(t_1);
G = logt_1*sint_2;
- yPlusGPrime =
+ yPlusGPrime =
(c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
}
@@ -255,7 +257,7 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
} while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.0001 && ++iter < 10);
-
+
if (yPlus > yPlusLam)
{
nutw[facei] = nuw[facei]*(yPlus*yPlus/Re - 1);
@@ -278,7 +280,7 @@ void nutStandardRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
<< roughnessConstant_ << token::END_STATEMENT << nl;
os.writeKeyword("roughnessFudgeFactor")
<< roughnessFudgeFactor_ << token::END_STATEMENT << nl;
-}
+}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -291,7 +293,8 @@ makePatchTypeField
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
similarity index 96%
rename from src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
index 8fba38d8cd4..b782fd83f59 100644
--- a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::nutStandardRoughWallFunctionFvPatchScalarField
+ Foam::incompressible::RAS::nutStandardRoughWallFunctionFvPatchScalarField
Description
Wall function boundary condition for rough walls
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -83,7 +85,7 @@ public:
const dictionary&
);
- //- Construct by mapping given
+ //- Construct by mapping given
// nutStandardRoughWallFunctionFvPatchScalarField
// onto a new patch
nutStandardRoughWallFunctionFvPatchScalarField
@@ -187,7 +189,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
similarity index 96%
rename from src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
index 95dc6ffdf29..d4be48e28f9 100644
--- a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
@@ -34,7 +34,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -112,12 +114,12 @@ void nutStandardWallFunctionFvPatchScalarField::evaluate
const scalarField& ry = patch().deltaCoeffs();
- const fvPatchVectorField& U =
+ const fvPatchVectorField& U =
patch().lookupPatchField<volVectorField, vector>("U");
scalarField magUp = mag(U.patchInternalField() - U);
- const scalarField& nuw =
+ const scalarField& nuw =
patch().lookupPatchField<volScalarField, scalar>("nu");
scalarField& nutw = *this;
@@ -141,7 +143,7 @@ void nutStandardWallFunctionFvPatchScalarField::evaluate
yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
} while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.01 && ++iter < 10 );
-
+
if (yPlus > yPlusLam)
{
nutw[facei] = nuw[facei]*(yPlus*kappa/log(E*yPlus) - 1);
@@ -160,7 +162,8 @@ makePatchTypeField(fvPatchScalarField, nutStandardWallFunctionFvPatchScalarField
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
similarity index 96%
rename from src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
index 29a18666875..b2b2509e79a 100644
--- a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::nutStandardWallFunctionFvPatchScalarField
+ Foam::incompressible::RAS::nutStandardWallFunctionFvPatchScalarField
Description
Wall function boundary condition for walls
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -138,7 +140,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
similarity index 95%
rename from src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index fee84087046..b25cc9f079f 100644
--- a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -34,7 +34,9 @@ License
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -103,12 +105,12 @@ void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
const scalarField& ry = patch().deltaCoeffs();
- const fvPatchVectorField& U =
+ const fvPatchVectorField& U =
patch().lookupPatchField<volVectorField, vector>("U");
scalarField magUp = mag(U.patchInternalField() - U);
- const scalarField& nuw =
+ const scalarField& nuw =
patch().lookupPatchField<volScalarField, scalar>("nu");
scalarField& nutw = *this;
@@ -133,7 +135,7 @@ void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
scalar f =
- utau/(ry[facei]*nuw[facei])
- + magUpara/utau
+ + magUpara/utau
+ 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
scalar df =
@@ -147,7 +149,7 @@ void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
} while (utau > VSMALL && err > 0.01 && ++iter < 10);
- nutw[facei] =
+ nutw[facei] =
max(sqr(max(utau, 0))/magFaceGradU[facei] - nuw[facei], 0.0);
}
else
@@ -164,7 +166,8 @@ makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
similarity index 96%
rename from src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index d6e4c8bd266..ba56ff00de0 100644
--- a/src/turbulenceModels/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::turbulenceModels::nutWallFunctionFvPatchScalarField
+ Foam::incompressible::RAS::nutWallFunctionFvPatchScalarField
Description
Wall function boundary condition for walls
@@ -42,7 +42,9 @@ SourceFiles
namespace Foam
{
-namespace turbulenceModels
+namespace incompressible
+{
+namespace RAS
{
/*---------------------------------------------------------------------------*\
@@ -138,7 +140,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace turbulenceModels
+} // End namespace RAS
+} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/wallFunctions/wallDissipationI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallDissipationI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/wallFunctions/wallDissipationI.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/wallDissipationI.H
diff --git a/src/turbulenceModels/incompressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/wallFunctions/wallFunctionsI.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
diff --git a/src/turbulenceModels/incompressible/wallFunctions/wallNonlinearViscosityI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallNonlinearViscosityI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/wallFunctions/wallNonlinearViscosityI.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/wallNonlinearViscosityI.H
diff --git a/src/turbulenceModels/incompressible/wallFunctions/wallViscosityI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallViscosityI.H
similarity index 100%
rename from src/turbulenceModels/incompressible/wallFunctions/wallViscosityI.H
rename to src/turbulenceModels/RAS/incompressible/wallFunctions/wallViscosityI.H
--
GitLab