Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

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)
     );