diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 5217f896993bf74920d48861ffd36278308140d7..09322fe8653fce1d4fc6c1d32be26232a6a4726e 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 4526fc31bbc716440112bda1a6f7e5a5c5a78713..357e749e9876d300da7557ce63651012da01284d 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 b2546074ca1d9a25ce687950dd91c72c346c0d73..7b207abeb44423a7d98c2284cd1aca8c1508dd83 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 1e5f789db1d32deaa223749d638f90d59a33aabf..c6457c2826bd661e210509e27bf91cc71b59eb4d 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 13de0659a582d485c3fd45123a040a0c144bc015..085bbba8f4e6446109dc9d454248a87c025b34de 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 a55eb60c564527ad97a9681877ff4dddabb4bfec..d932a5dbc16df7fa185e0f49bc6765b6085cff62 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 0179a3a3301aafd8f3c52474f07d26ccd6e6ebe1..c3928b42749466682c0c9b4232133eccd55fac3c 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 896e479db5093f593bb5cd34665005a29808c9f5..b19c304f706872ccbd1ae99eb32b7aa8eb19be1e 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 e05f5809607e29ec258ffe24c13680ece5c77b6a..952aa3091a9644136d0ac1355fc87e93dd526e72 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 28ce92ba32a24529d39147a6d1aa159209c9ae5e..ad9827feb7b118ec075c9f58b783e428ddb509dc 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 ddf6a7b342ca93e10f8f967a1809ac7956f0635f..1bc6e360d0b0d188cf92481621d8fd8877c77914 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 6e789b67e21d9446a1fb2b632f53461694b758c1..1679646dc1d5e583abef143049181c094ab11994 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 c3b1a00728bebdbf748045ff0b4769eb65e21eb9..46c3f63621b64bb1c5814819f6742c60f091f3e1 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 6e789b67e21d9446a1fb2b632f53461694b758c1..1679646dc1d5e583abef143049181c094ab11994 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 8fe0a8bfd401a1fe858df1c6295ce2d26ea4ed99..9a953a45d4f68083c3b7db49cc0a345e7d3383b4 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 87490408ffebee2bdd2c16d6b2ef978c1fa674fb..42838550d116d18cae971a6ed2f241d76967f2a0 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 0000000000000000000000000000000000000000..331a2aaa7ec522107455b8e44e3e177341bf0a72
--- /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 0000000000000000000000000000000000000000..331a2aaa7ec522107455b8e44e3e177341bf0a72
--- /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 0000000000000000000000000000000000000000..331a2aaa7ec522107455b8e44e3e177341bf0a72
--- /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 0000000000000000000000000000000000000000..64e53cdc778a2c4b6887a4f83d3e2385feb5c978
--- /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 0000000000000000000000000000000000000000..64e53cdc778a2c4b6887a4f83d3e2385feb5c978
--- /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 0000000000000000000000000000000000000000..64e53cdc778a2c4b6887a4f83d3e2385feb5c978
--- /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 0000000000000000000000000000000000000000..f590d9ba6ff3e9de34ab75cdc4e2ff3bd62dc748
--- /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 0000000000000000000000000000000000000000..f590d9ba6ff3e9de34ab75cdc4e2ff3bd62dc748
--- /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 0000000000000000000000000000000000000000..f590d9ba6ff3e9de34ab75cdc4e2ff3bd62dc748
--- /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 182c88e29121f901026a8e08d46daa7bc2981ba4..ea9f7366bc877d0044a20242e93c742ba52fef85 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 6e789b67e21d9446a1fb2b632f53461694b758c1..1679646dc1d5e583abef143049181c094ab11994 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 12943280aada9d1c5db3178dd4475c8b43265014..521010871707a8c9731005eee0332c1d8c2cf612 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 6bf54dad003cf91b4c5e8668cc5494f803a01d10..2fe2cc72a361466d3ad3b39d04b5ac6b5521c4c6 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 a6f265faae1558f724dcb3d8a9100ca75bea30d7..5291715440119688154079a429c8c66c8a1f4f6d 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 5a252d870422421bab3c95e06e79762c0aa6a24c..d660ada818947920b0f569123d641fdab2281b08 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 9413e969c3ab3d75b6657b7bca811a1b6f115b35..2dc02308d79846de2c779bff5dd18d440f206f91 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 9f6d88d3ea645d3e58ff3654621cf15d8a33b0a6..89e1642a87fd0e3095f4aa9a0a7c79db03399b6f 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 60f3062d3719eca66e2dc26ef4ab2fc005a76f90..31c3ac591555b8c68d7a16fe70bb6b8be9cb8e9d 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 36e475b86caf027f90b7ba9a2dd9c18313ea857d..5f39a2f09344ce15ae9f1e54d1f77324fcee32df 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 0247c89bbefd8f0251ce379eca339be0ca7768b5..38a50d776688f78c1c7a82a5f486e05035d768ad 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 ef6915707cbfd978c38fa6438d4bb2001ca963c1..13680640c47645c2b35150c57bec51b351db7dd2 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 84478adc3c3a413c8551b8dfb1b0b70958e871f4..020d1798393c662c639a0617376b1244ecb6f382 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 2a1549655e80a47025cf5109260d5e6b0302354d..633daf3e733a70f11fa36d67863095d8fad1e23b 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 a536e9cce6b47d005138ef39bac6416fb91deb32..ff3f9c51696c506eb51878d4e8a07b0837b0b89e 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 949db7527488e374a823248d77b1c0d02db76b73..b8036f1d38cf2d1801e6e23e752f29bbb0178712 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 8025fb372ea9558bf796fa1ddf256a48015fe7ea..7cae304f6f6d018824d5dba8ebbf3598fff7c3ad 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 7f7317e77a1e286b8cb5bc39c371044c9b592126..acc310726a87b0bf4db32101fb85768d46a03620 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 0f706f8621b3e6206cbab5ccc5554a887b36f595..ddd0160b0074b4ae66f03c0443a82b7df863939a 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 464d28cc45c07e78bdc81bc0fc7080161f6c0b1e..48e8f1da205ac0ceaf6d9200672b454628fa5ca9 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 f1f3bf58153f2e598918e78159720d420a1ca862..af6ebd0be3d535749fb7b1811ee5c7c03a9c8121 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 100c5a0cacc6306b2bf9ae535813af0faec055a7..988b21f834e3045ebb84ffc750cff1ce224de830 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 3a5db93cb88d7944025d189ae5983f57a32a5044..2e519dc17cad613aa6728574483ab55b2e173876 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 6581e962c4a7e0d0350993f2f79946d16f881e86..4e0763a101fe33a23e6acf5307e6c2d234650ded 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 16b59ec9892caf82587520f41f734f30f9051110..3c761572bf6f22bd855df9146b24f553a0ca4561 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 ffd4930257d92e2b8dd4013c9f1490d4d4217523..4c09b3efbede5be855353157a50cfb3236ec03fc 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 21f5b136bbd09ac2f4c833844ddbb96a842e4375..da236f7673d3488fac79cb8c965f398426503920 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 4994db0f9610bf51a139810b1aa4e1d127bf2068..27d86562c3772978db626aca384917cc87e78bf4 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 988e8b3f744843a8c2cbad99520cff0c1c938821..8a3e4d22f05a6f1b7b6abbcaab0cde9d4a5deffd 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 0000000000000000000000000000000000000000..4f2052f73c695acc22b4c76dbd6d9be117357030
--- /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 0000000000000000000000000000000000000000..816485d1137caba0f317681e77699161f3a2dbfd
--- /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 f67d6a42542e5d57912090f1683f590a3aa23b1b..f6c92548fc5b12c7426577cb628d106255bca542 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 9c8c75049468567abda5be8cb9d36af590b79960..9d437d43555b2f30ed9f9c6ebd69aba4407dfc02 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 47f63723e30021bb3c2cfa9adf327f7e0981cbc4..b0d119d8887aaaf86e47349542e031c5a772fd20 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 149b58cc98164c981b69f0421d13cf80470f24ca..8b6867b6fc917bd146cf2704b5fe3f267603beca 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 35ea975f36a0a100e7269f6a833fab9d19105555..72d049103dafb1869244db5cec4caf740df8c393 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 47f63723e30021bb3c2cfa9adf327f7e0981cbc4..b0d119d8887aaaf86e47349542e031c5a772fd20 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 35ea975f36a0a100e7269f6a833fab9d19105555..72d049103dafb1869244db5cec4caf740df8c393 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 6802a3c91fbd96842feaffec5ca65bd9d8dd785a..eae57baa897cf5f51fa6e8adb5b43bae74a91584 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 cd5d76740ba7bb44afcbea0fd6a70a42b9e485bb..52cd861cbd99a6d3741fcb0cf3f4aae9b61bd536 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 b0e647e10a1e3ef1f41e11bce4758f9dbd53c759..6437903e0c05c3ff367197a834b0bc565108cb3c 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 49c8ba9144d9ef7e1c05dbda2192a64177342aa8..bcd694b4251f6f48287bfc53340c0fb032b562f3 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 b0e647e10a1e3ef1f41e11bce4758f9dbd53c759..6437903e0c05c3ff367197a834b0bc565108cb3c 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 35ea975f36a0a100e7269f6a833fab9d19105555..72d049103dafb1869244db5cec4caf740df8c393 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 cb15a51f9ab66a32858d61b076221ec8d8e796b5..d1465c1a7cfec5f034a5657306f447f79c91a85e 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 b0e647e10a1e3ef1f41e11bce4758f9dbd53c759..6437903e0c05c3ff367197a834b0bc565108cb3c 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 6792332b65b03ae2e4c1aab884fa58be0c193652..2f53660d1112b5a80128b33ea46a97fd578b0368 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 1db8264e3f74ec9ccb5a50cf7ccca1254a9425c6..f7b68983c6fa2882aa2a5c6c16f2e2c43597a597 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 5ccba2b371a2f8a1c379f138a8011ebbd4058c37..a05e81fc00ac07ad38b5f6a7424bde23be04898f 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 3cfd53504db7f92919a1e04257cb3de2ae63d2ab..6b4b10032a5808c3cb012b4e8e70ab6ad31c26a5 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 45b0929f7d8b2d8526aa86f5551073708d5c4b44..c184acc53ae11be628da9d92cf351b04f21ab0b0 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 08d7d6cf978328d30dcf0728be7bfc4e9d03d9ab..d52caee3f9f8a0a7c51a638155689cdb33bc1428 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 099b16fd86557a25b83a69ef0a7ebee856052573..d2d879d3a8e05b2d0be8058c7d1dbe9b62733fcb 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 d1b565a97821887a3834a223d5504f353874ae10..2c7dff7006eb3e1afa5c02871e122f3ea6329804 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 8035007e87b7c0aba29dd46b6d04845a57a15638..384e49f50ed9cca49843999ceb639dab59ed15cb 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 d01361960484492f75caf2bbd65700b1e9582604..9f0da00e30d472756c59e2307c5ee43cab56f948 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 39828a9c030a5f924ef00df4467a567cc89f6ea8..7966b33e814f7d4b05b450e44a26bc1bdb9c77af 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 94c530e1d5c83b7220e8785c85d4494ffd42ee97..66a7f160fce67fca27ae001eb77ac05fac2c4b90 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 df1f27f98cee7c513df821dafd4c2ab029399fe2..864f542fa3b0f31a6cc231b0933737f97d405506 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 b6e6074ae7c057fa470d9319566bf75025718462..79a8a4d7d39cebe7582ddaaba9ba4ba1ef91b223 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 8f3685453c2a075edd294a168b98055683730d9e..0da469153e75e2114b74f1f051cdf816acea386b 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 ea7fb7c04bf4a59bd1a073c65bb3844e1c932d5e..6c6ec6cc340e3ab2816f3367bce8b83ab0ec0d17 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 07c594976a78361cd091e38ce03e5f4f5b5d2c3e..09494ac02e4002dc8e1a364f58bf629bfba01493 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 65f7b4f4169b7b92b425a2ddbc63077f6b95d980..a8fb1c8b6cc9598d7a7b8d6d787f04094125c48e 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 00c0fbe96b203ba5cbcc4cc3a0f72088fbe6dda3..f6d9a0181168e7fa18e28707b3b6163fca50d51c 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 09455a825f9396e92b66dc7f30e729b9ba7ada0d..850ce019b0ed02d2c70fcdf0e383ea82b4f41c94 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 05924747bb2ff78fa43d9bd959f9f7bad87ba3d4..b5d47a573049b60dfe7d89b6c3961718e9a4b4c4 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 54d9ee302cd0cba4abd58db162683adf021d045a..29a52fca67cfa28d7f1b35ed1ff8610b36a7d57d 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 1a76b74acf942bd17a6ce02ea1e6becfd40b3771..e963a81f739050005fafedd11a29d52d2d0e4603 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 d7b2d06b6ece967adb83c69c6035488f2de6c020..54138e0df3e72acfb5115845eae4e51f4e483a09 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 ad6f1db5c27bcd93ac639afcbd235862ef87cd81..4087e21545613fb494267f700fbd3b59864099a7 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 b66f5da2405857ac65a98071f1e6b08c5f02aa24..62cf67dc1c7566f996c54c23f0f9c2aa9158fbe5 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 9eee42fa26a3eb2ad9cb84069d263bf4db828e4e..f06fe00f53f9c7169c8a6a06b32a909edd0fec5c 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 297a06d352ee71a44749b420ad347e10db3314cc..98f31d6aa870f3eb17da204d903e3367dd911dde 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 1ae232f295fae30001038236d7b72adb0389c538..544727b8acb8f9b93a564832b5bb047a335b94c9 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 b9be93207911983041ae1708bb65fea8de2075af..f9e5c057b82f6345c94d97fda9795a88c7415b6d 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 0db4c249611683e8edac04bfb5cb1ce2b39e0266..a2991710f1c211847e90db63d8b94d71e97566a8 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 706812439ebc469f02949b1ef725c8db0aee41f0..ff626ed7b6b58e50558e0eefd49b6cf3ff0c80d1 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 bcedf4cd95db34cfd77875fda3cbb58836a57369..9464b9b48107e1cc06c9ae8e72ebabe97387ba9a 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 7ca2395725c1c3f4d64b609cca511c359a036fa3..dbb8dbce91da6839d000990d451d6538a6b78f8a 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 7fd2a59d78b7aae0282088c763e88ff14077d81e..3a682680fe9f08321aa1e14ec9386cb5675f3e64 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 5c8c25bd4eb37031cb3102e160b9f372188085cf..add91b8fb32921bdff905a58b419ef979a4b2d14 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 c36143e9d787398706aa73afd2717f00b032c5e0..459a9ab9dbadb65f467430922dd30eac71dec5c8 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 0718ee02204795fed761c2633a5175c1080e40c8..f8eb662e2fc8e5fddf139a2a433e2cb344302070 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 40bedf4243d0506b4e65d2cfa58d41405867ba92..b25ae74b621a8ec18f58830d6be90f1008f7ccda 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 570aa08b5421fc824093d8d6affd0d8c536afd61..4c397782163eedb0c7b53a2caf8fa829972d7495 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 8618c220ad96c2f7393a26c20adbae76d1c4a70f..84c8180233709dbe1ee8811086ca1213904a8da1 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 ca03a7fd00e0d16b2f1a452dc883488a7a6e7bab..85802cd231a26ceb4c887deafea0e61961cd84dc 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 ccdbf5b48a2477a699b95e54ac7218bc7721e6ba..f4d44cf6e6572bd4e832f4140cfc710b2f3e4110 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 5d55ee8aeae04b3187f900f3b045416201f7dbe1..92389fa94a60ef5a32a121d4b0e4c488067ff368 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 c65e7789e93d0f31448f7f96de8fa029b844eb63..e4dc2fe2522f9c77f14c38ca725c1eb740bea421 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 a394c814e1ff83ebdf82b5d6b6ebd5f241588080..95c48f7fc7c4f16d0b6b257850eccd422ed86474 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 391026bea5e678f45397c5966b99db50337530b5..8296e45f10b263bd26fdc6f44e8ba812108c016d 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 338143a5a6e9920057a83cb4ec9184284fe2bf99..e9f7093ef3b85f52a85e3174b158de9cd1836b28 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 1cd7115f21ef4ad8d925dc2c57bb77b99a796371..f6d95f3ee98d874427013c037109aeae57bf24eb 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 81b605d86c2b892eb2caf3d3f4bd6d4f59c45748..828d43ceddf300d1834429e2729be6fea0119d39 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 a5469960159489f33e093a88edd5dcc5558a0dab..ea6395c09197138e8b9e137fa3df19fb1e0afdfc 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 56e0b5d3165bcf267a7aa0b12e7812c948fd42c4..fab13467a9e71d6e99f0601bbc5df78a6c88e3c0 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 f909228f2b260b82c85ba9ad7e2492b74c71d371..71f8f3b4cc67f87d489de9a3fc768a37de6b0740 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 edad7876e1ca307112b6efe2622a967903a84b16..da16b1a604b6e5afd6bce4901c1e63be36a54395 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 2543b835fd404062c0203c5528b06f5c93501307..928798d406b813bfabb0738d4354b128ae30de67 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 bdc974b2c03f51bd8e7d309e0e217f14d5b3f808..a6333250226acf59b2f2ae29114d645fc49e4d23 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 98302062c640139cdb425c9cd91f2475ecf8b9cf..ff96b5aaf53aad05ada78921495610bbc100b9dc 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 e8ec8c7b9f935f94768ec5268de135bba1d77555..1c39967b7ebee5923aca45054f007b55049d7f4e 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 66297125eb404f0bd7394dedc9f1cd5f4d4d1faf..5bf9968fe5ae05ffd262b76024ef25e56500d245 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 0000000000000000000000000000000000000000..5ccba2b371a2f8a1c379f138a8011ebbd4058c37
--- /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 abcb8e08a897cc78325d0c3b0d94fc66988928e0..6127a63e3f210c7c9b377d8c86f48090bcc91788 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 d095a0870789884981bbfd1e145efcd1a75ef85e..3ac8c47a0062fb57bce28aeda221f7cabb3c29f7 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 af49d94b98b1a628383b65645500c60043123f69..d7bac108dea6fea3c394c0de3be043e1b263d3b6 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 3a9bec067983076961b42149e8dac61566605366..c6e9128711e551af78c9c04940e35c64848c0881 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 ed86a5e8859229310e2b6cb46c3c971915e62cf0..90ff2b01c2f1087ed8e25abd87942c27395b9db1 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 1bfb5eecd23f5fa3bd9b53d266bdaefa0bc4376f..07eda8047b52495a40672396b76837a2149b40d5 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 d13d4ff1d3ad970f16563d117b816af6183ce56d..072e8d65e37d2a1c6738bbbe2825d899e344615c 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 f3e5c31c9f9e2ac40867be8331420506d111508f..3d70f721a55a4c1454a2ea02fc83ececf837c0b1 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 802a63c8c935039af44e74610ee803f327338507..d6bd52b61a9ea532fba75bc8c184d4951f3081cb 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 fbb1761d20b519480a7a37c22e39f464859f9e06..08b41ddb115bfc07ea7984118f20eaa80a93a5b9 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 e77192b006ebb5b33050e22330f5904f7269684d..6545b763d90c32bfd10e7240e1a7f641fd434501 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 f88830349a7ad925d03c7ddfe4f2b3ab3e4d1a1e..3a58da60b33427ab254dc7a4197a7c42f1ba333e 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 b9b511d839e8466ed1654b99fb5bc7315a514fb2..3369960b4fb926804b7ea8f53a4ba73fea863aa0 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 b0a4905fa03c8ffa5197d6c8e128f410e6e06302..717403d3e8339027f4de6e9746e12730dbb87c7f 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 0a576c96ec77d5cbdf666a1ef1b2232669ac1a8c..291f40e58554f661a3bcb92bb8d8e48c1f1654e6 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 e3c062878fef33bd1103d3b1368203df6db3ce5a..31efee8b39ea5e5ff17793b60d088de4f1e6e735 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 e330ca3c210a8ce78ee10a1043cd8f694e2ca7c8..f7aa5b9fef40966401bc2fd71423c4fa154f4ad6 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 73e64b2bb46d817d14beb86b888891efce079422..d8f1d10e11bc898e2c736d1b1595dc1bc3fd5f73 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 5036bff2067d9fee0e7a770fbc80072de5e67ec9..d0a3b2ae1a93adaba6643e98303439f9d706a704 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 3c694027504dca246b43e3e7c485395b967842cc..64d45abbdfeafefd8587ab74b4a56e305ec35c10 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 faba6f3e972e3431bd34f6f1086dbceffeae72b4..081f68ae6763c94acc371304560c55d626c910ff 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 ac1fa841b1c2cc71036ce128caf3ef2911c71c30..1151255d8b28869f04444c0ace31eec8c36798f5 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 bcc6c119d58e675d510f3b45149b3b568b95c6ec..e4c8c9f338faa908a1cf8552e386955007dda325 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 02921cc661e73a7013460ec52866a556e960ecd9..eaa3da29846626a9d49199595e6925c75175882e 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 b78998d6ce7fed1ec01c37d21dc6276550c601a2..4a9f48ecd45c9e4c8fbf7adc3e1e4010180b6d6f 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 3aaaa93f9e689da06cd71d3cceb0d84af6d23fd6..d2fb24cde522a2b788538d9916747a52bffeaa16 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 5ca442e79e59c9646b4482e662baf872fca0694f..82ea6ae7d5a78c91407652a725ee1542b67c128f 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 26083398642a869036cb136e5842c129a691d9c0..edf6c03051fefcc7250624995cb7219ae3f0f8ff 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 f83fa6fdac5d6d86098c657a743d4fd1f276caa2..befc3a589b76ba2611616bf1b4704339f14d2567 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 4390541ffd89b890ad95a09068968e1f1bd094f5..3050ca0c1bc17362a1b76b08264c8c351d13135d 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 cdcfe24a27f2ea90888b0bc989934f0b180b96bf..4b1a061df7e5da54f302514e343b753b680f0517 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 662de4fd4881dc3168c4f13211a12df6e945f74c..96cae22468657634394d7c9e02dd09c3d78ef4da 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 445799b42856cce82ffca8fdeaa96a79d7a480ab..17e2dbfacb5a0e4d443413e3ddc728eec3f1c7da 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 dba79ad54eeb21e71bf8f86a48f223b1268ce7ba..8f9b218d1d3b7b67e6ad2bdd854c0d55a75d7dc6 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 f921fe6fc817d17152404953c8381e132b99815e..effce00a165a0c57b959b9592dc86122a5a6bdb5 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 ac432e46184fda12249cd91a6597af46a09ff888..8001d707c74bbc0828ec300c67fc40dbecd11e49 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 5a820e9a2117beb597f9d5573e4d6f4b96a693d5..f8e5973a647a230953869412fd712b67caaa7516 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 27198fef05d21ef4924e92ab4aa69f7152a48020..d10559ccdecbde08c8d682eab195c44cc7c87a58 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 7ad93af896d35ba49ed02a9d1693c127e884c8a8..5e9d6953f0777308f05148e8348d957dde6f067d 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 6da8e707cca7ea74bd7f67a67734be885cd9c27c..5ec48b1ed52c9fdcafc06d56fbaad38ad3c8fbc0 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 307c9b72199f207cd48519c40d6d6a6dd6114b28..47df99ac8cfcca7b2fcd3bd81236ac26c9d68fbe 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 197da2eee5c3e38293a46b36a039f2aaab6205c3..c6237654646cbd74638555026a643d8f4ac58a4f 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 ef0be3c3bee44347f8825499ae3018cabc016436..6ad20dbe13e8ad9e4e6134cd1ed307e838c35d76 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 fa55f6b70262297093c9062cc314e28679d2f98c..524649e8f3de27cf23e6735f77c83167e772db8d 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 9c80f45af95b17bef5bf7c32919c35369b07dc39..697edabc2f140d4ec49748bdb13f0a97ad1555b7 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 0530b4f2fc337ae061e0f09c1e8def2d31d74e00..a2d6838b28f77f161e676168c306db193725cda0 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 c4b9bbd90e9d9ca46b93bcf33f8101a2f563c376..0672ed3f394415bfd87b3e467a5942efc79173e2 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 23096bae43ec2b6e4083ec98abac7087f446d8c4..931adedc68e8326fac0435269b377fdc9a567e3d 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 60ec7e3e3d328710640e8d0f6dc568e357b5a3a1..e29ac76b495cde844f435fb4efd5c63bc484e879 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 84da5614448d0ba67e1b2ca31a0656893de273d6..132a7b84cb44a20c44f861c06b1845b975ebb185 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 d6e9f62f8061fab97450d3e92868bad4de396cbd..41c15c9ee59d6256db81cffe019094e536dd0e9f 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 bed073afa83112e93781554b8ff810485bc99412..6b060f9419d7691310d240de37b98cee8e7fe6c9 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 3f1e371f963e06fe42f19f1c7b8045bad3516b87..7c157e8940e89078e2a4c774382fc5f28e25c0d5 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 a8bd512763bc1ead7c18dee57cdc150188f7dc27..aaeb320f1de4a626abdb0a3599a6046491798244 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 90553c846624bd9b24c3797b79abff22a78f0657..ac6cfb35ec3e6f133dfae2e9a742c118f260048f 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 8fba38d8cd4be023a3f7866d6016f01cd718db1b..b782fd83f59407af2eaccac1bcf3d9e63bcc569e 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 95dc6ffdf298122c1d8be7ab17a4163513b491aa..d4be48e28f984e74b066a170ba04b90f94c02b5e 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 29a18666875b0a1ad8d0ac53bbba30915fa35698..b2b2509e79ae906a717d63b05f179757800415ee 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 fee84087046b3b87d0791fc068a7f5d24475a338..b25cc9f079ffd381014271cee1fa157c5aafa11f 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 d6e4c8bd26650a7f66c8b512c7af97a178f33a41..ba56ff00de025e5d084761f90fa3a47ba878fad0 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