Merge commit 'origin/master' into olesenm

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/solvers/multiphase/twoPhaseEulerFoam/Allwclean

 wclean libso phaseModel
 wclean libso interfacialModels
-wclean libso kineticTheoryModel
+wclean libso kineticTheoryModels
 wclean

applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake

@@ -3,5 +3,5 @@ set -x
 
 wmake libso phaseModel
 wmake libso interfacialModels
-wmake libso kineticTheoryModel
+wmake libso kineticTheoryModels
 wmake

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H

@@ -56,14 +56,13 @@ class Ergun
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("Ergun");
 
 
     // Constructors
 
-
         //- Construct from components
         Ergun
         (
@@ -74,9 +73,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~Ergun();
+    //- Destructor
+    virtual ~Ergun();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H

@@ -56,7 +56,7 @@ class Gibilaro
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("Gibilaro");
 
@@ -73,9 +73,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~Gibilaro();
+    //- Destructor
+    virtual ~Gibilaro();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H

@@ -26,7 +26,7 @@ Class
     Foam::GidaspowErgunWenYu
 
 Description
-    D. Gidaspow, Multiphase flow and fluidization, 
+    D. Gidaspow, Multiphase flow and fluidization,
         Academic Press, New York, 1994.
 
 SourceFiles
@@ -54,7 +54,7 @@ class GidaspowErgunWenYu
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("GidaspowErgunWenYu");
 
@@ -71,9 +71,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GidaspowErgunWenYu();
+    //- Destructor
+    virtual ~GidaspowErgunWenYu();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H

@@ -31,10 +31,10 @@ Description
     Int. J. Multiphase Flow, Vol. 22, Suppl, pp. 21-66 (1996)
     Eq. 86-87, p. 40
 
-    This is identical to the Wen and Yu, Rowe model Table 3.6 p.56  in 
+    This is identical to the Wen and Yu, Rowe model Table 3.6 p.56  in
     the Ph.D. thesis of Berend van Wachem
-    'Derivation, Implementation and Validation 
-                    of 
+    'Derivation, Implementation and Validation
+                    of
           Computer Simulation Models
          for Gas-Solid Fluidized Beds'
 
@@ -80,9 +80,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GidaspowSchillerNaumann();
+    //- Destructor
+    virtual ~GidaspowSchillerNaumann();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H

@@ -52,7 +52,7 @@ class SchillerNaumann
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("SchillerNaumann");
 
@@ -69,9 +69,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SchillerNaumann();
+    //- Destructor
+    virtual ~SchillerNaumann();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H

@@ -27,7 +27,7 @@ Class
 
 Description
     Syamlal, M., Rogers, W. and O'Brien, T. J. (1993) MFIX documentation,
-    Theory Guide. Technical Note DOE/METC-94/1004. Morgantown, West Virginia, 
+    Theory Guide. Technical Note DOE/METC-94/1004. Morgantown, West Virginia,
     USA.
 
 SourceFiles
@@ -55,7 +55,7 @@ class SyamlalOBrien
 {
 
 public:
-    
+
     //- Runtime type information
     TypeName("SyamlalOBrien");
 
@@ -72,9 +72,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SyamlalOBrien();
+    //- Destructor
+    virtual ~SyamlalOBrien();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H

@@ -83,9 +83,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~WenYu();
+    //- Destructor
+    virtual ~WenYu();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H

@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~dragModel();
+    //- Destructor
+    virtual ~dragModel();
 
 
     // Selectors
@@ -118,7 +117,7 @@ public:
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
         // **********************************NB ! *****************************
         // for numerical reasons alpha and beta has been
-        // extracted from the dragFunction K, 
+        // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
         // **********************************NB ! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;