Added kineticTheoryModels namespace and put the viscosityModels in it to

avoid name-clashes with the standard viscosityModels.

The other kineticTheoryModels have yet to be put in the kineticTheoryModels
namespace.

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;

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Gidaspow/GidaspowConductivity.H → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H

@@ -63,9 +63,8 @@ public:
         GidaspowConductivity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~GidaspowConductivity();
+    //- Destructor
+    virtual ~GidaspowConductivity();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H

@@ -52,7 +52,7 @@ class HrenyaSinclairConductivity
 {
 
         dictionary coeffsDict_;
-    
+
         //- characteristic length of geometry
         dimensionedScalar L_;
 
@@ -68,9 +68,8 @@ public:
         HrenyaSinclairConductivity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~HrenyaSinclairConductivity();
+    //- Destructor
+    virtual ~HrenyaSinclairConductivity();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/Syamlal/SyamlalConductivity.H → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H

@@ -53,8 +53,8 @@ class SyamlalConductivity
 
 public:
 
-        //- Runtime type information
-        TypeName("Syamlal");
+    //- Runtime type information
+    TypeName("Syamlal");
 
 
     // Constructors
@@ -63,9 +63,8 @@ public:
         SyamlalConductivity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SyamlalConductivity();
+    //- Destructor
+    virtual ~SyamlalConductivity();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModel/conductivityModel/conductivityModel/conductivityModel.H → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H

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