created incompressible namespace for incompressible LES models

applications/solvers/incompressible/channelOodles/createFields.H

@@ -37,7 +37,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<LESmodel> sgsModel
+    autoPtr<incompressible::LESmodel> sgsModel
     (
-        LESmodel::New(U, phi, laminarTransport)
+        incompressible::LESmodel::New(U, phi, laminarTransport)
     );

applications/solvers/incompressible/oodles/createFields.H

@@ -37,7 +37,7 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<LESmodel> sgsModel
+    autoPtr<incompressible::LESmodel> sgsModel
     (
-        LESmodel::New(U, phi, laminarTransport)
+        incompressible::LESmodel::New(U, phi, laminarTransport)
     );

applications/solvers/multiphase/compressibleLesInterFoam/createFields.H

@@ -146,7 +146,7 @@
     interfaceProperties interface(alpha1, U, twoPhaseProperties);
 
     // Construct LES model
-    autoPtr<LESmodel> turbulence
+    autoPtr<incompressible::LESmodel> turbulence
     (
-        LESmodel::New(U, phi, twoPhaseProperties)
+        incompressible::LESmodel::New(U, phi, twoPhaseProperties)
     );

applications/solvers/multiphase/interPhaseChangeFoam/createFields.H

@@ -92,7 +92,7 @@
     interfaceProperties interface(gamma, U, twoPhaseProperties());
 
     // Construct LES model
-    autoPtr<LESmodel> turbulence
+    autoPtr<incompressible::LESmodel> turbulence
     (
-        LESmodel::New(U, phi, twoPhaseProperties())
+        incompressible::LESmodel::New(U, phi, twoPhaseProperties())
     );

applications/solvers/multiphase/lesCavitatingFoam/createFields.H

@@ -79,7 +79,7 @@
     twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
 
     // Create LES model
-    autoPtr<LESmodel> turbulence
+    autoPtr<incompressible::LESmodel> turbulence
     (
-        LESmodel::New(U, phiv, twoPhaseProperties)
+        incompressible::LESmodel::New(U, phiv, twoPhaseProperties)
     );

applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.C

@@ -31,6 +31,8 @@ License
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -115,6 +117,7 @@ bool devOneEqEddy::read()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //

applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H

@@ -61,6 +61,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -136,6 +138,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESmodels
+} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/lesInterFoam/createFields.H

@@ -109,7 +109,7 @@
     interfaceProperties interface(gamma, U, twoPhaseProperties);
 
     // Construct LES model
-    autoPtr<LESmodel> turbulence
+    autoPtr<incompressible::LESmodel> turbulence
     (
-        LESmodel::New(U, phi, twoPhaseProperties)
+        incompressible::LESmodel::New(U, phi, twoPhaseProperties)
     );

applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C

@@ -162,9 +162,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
             }
             else if (turbulenceProperties.found("LESmodel"))
             {
-                autoPtr<LESmodel> sgsModel
+                autoPtr<incompressible::LESmodel> sgsModel
                 (
-                    LESmodel::New(U, phi, laminarTransport)
+                    incompressible::LESmodel::New(U, phi, laminarTransport)
                 );
 
                 execFlowFunctionObjects(args, runTime);

applications/utilities/postProcessing/velocityField/Pe/Pe.C

@@ -132,9 +132,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
                 }
                 else if (turbulenceProperties.found("LESmodel"))
                 {
-                    autoPtr<LESmodel> sgsModel
+                    autoPtr<incompressible::LESmodel> sgsModel
                     (
-                        LESmodel::New(U, phi, laminarTransport)
+                        incompressible::LESmodel::New(U, phi, laminarTransport)
                     );
 
                     PePtr.set

applications/utilities/postProcessing/wall/yPlusLES/createFields.H

@@ -16,9 +16,9 @@ volVectorField U
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
-autoPtr<LESmodel> sgsModel
+autoPtr<incompressible::LESmodel> sgsModel
 (
-    LESmodel::New(U, phi, laminarTransport)
+    incompressible::LESmodel::New(U, phi, laminarTransport)
 );
 
 volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();

applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C

@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
 
         singlePhaseTransportModel laminarTransport(U, phi);
 
-        autoPtr<LESmodel> sgsModel
+        autoPtr<incompressible::LESmodel> sgsModel
         (
-            LESmodel::New(U, phi, laminarTransport)
+            incompressible::LESmodel::New(U, phi, laminarTransport)
         );
 
         volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();

src/postProcessing/forces/forces/forces.C

@@ -75,10 +75,10 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 
         return les.devRhoBeff();
     }
-    else if (obr_.foundObject<LESmodel>("turbulenceProperties"))
+    else if (obr_.foundObject<incompressible::LESmodel>("turbulenceProperties"))
     {
-        const LESmodel& les
-            = obr_.lookupObject<LESmodel>("turbulenceProperties");
+        const incompressible::LESmodel& les
+            = obr_.lookupObject<incompressible::LESmodel>("turbulenceProperties");
 
         return rhoRef_*les.devBeff();
     }

src/turbulenceModels/LES/compressible/LESmodel/LESmodel.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Namespace
-    Foam::compressible::LESmodels
+    Foam::compressible
 
 Description
     Namespace for compressible LES models.

src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C

@@ -31,6 +31,8 @@ License
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -126,6 +128,7 @@ bool DeardorffDiffStress::read()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //

src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::LESmodels::DeardorffDiffStress
+    Foam::incompressible::LES::DeardorffDiffStress
 
 Description
     Differential SGS Stress Equation Model for incompressible flows
@@ -60,6 +60,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -128,6 +130,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C

@@ -30,6 +30,8 @@ License
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -110,6 +112,7 @@ bool GenEddyVisc::read()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //

src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::LESmodels::GenEddyVisc
+    Foam::incompressible::LES::GenEddyVisc
 
 Description
     General base class for all incompressible models that can be implemented
@@ -46,6 +46,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -129,6 +131,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C

@@ -30,6 +30,8 @@ License
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -174,6 +176,7 @@ bool GenSGSStress::read()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //

src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::LESmodels::GenSGSStress
+    Foam::incompressible::LES::GenSGSStress
 
 Description
     General base class for all incompressible models that directly
@@ -47,6 +47,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace incompressible
+{
 namespace LES
 {
 
@@ -137,6 +139,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LES
+} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //