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

@@ -1,4 +1,4 @@
 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

@@ -63,7 +63,6 @@ public:
 
     // 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

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

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

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

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

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

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

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

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

@@ -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

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/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H

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

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/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H

@@ -53,19 +53,18 @@ class SyamlalRogersOBrienPressure
 
 public:
 
-        //- Runtime type information
-        TypeName("SyamlalRogersOBrien");
+    //- Runtime type information
+    TypeName("SyamlalRogersOBrien");
+
 
     // Constructors
 
-
         //- Construct from components
         SyamlalRogersOBrienPressure(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SyamlalRogersOBrienPressure();
+    //- Destructor
+    virtual ~SyamlalRogersOBrienPressure();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -65,7 +65,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
     equilibrium_(kineticTheoryProperties_.lookup("equilibrium")),
     viscosityModel_
     (
-        viscosityModel::New
+        kineticTheoryModels::viscosityModel::New
         (
             kineticTheoryProperties_
         )

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

@@ -43,13 +43,12 @@ SourceFiles
 #include "radialModel.H"
 #include "granularPressureModel.H"
 #include "frictionalStressModel.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-    //class viscosityModel;
-
 /*---------------------------------------------------------------------------*\
                            Class kineticTheoryModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -79,7 +78,7 @@ class kineticTheoryModel
         //- use generation == dissipation
         Switch equilibrium_;
 
-        autoPtr<viscosityModel> viscosityModel_;
+        autoPtr<kineticTheoryModels::viscosityModel> viscosityModel_;
 
         autoPtr<conductivityModel> conductivityModel_;
 
@@ -152,9 +151,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~kineticTheoryModel();
+    //- Destructor
+    virtual ~kineticTheoryModel();
 
 
     // Member Functions

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C

@@ -31,16 +31,21 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(GidaspowViscosity, 0);
-
     addToRunTimeSelectionTable(viscosityModel, GidaspowViscosity, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::GidaspowViscosity::GidaspowViscosity(const dictionary& dict)
+Foam::kineticTheoryModels::GidaspowViscosity::GidaspowViscosity
+(
+    const dictionary& dict
+)
 :
     viscosityModel(dict)
 {}
@@ -48,13 +53,14 @@ Foam::GidaspowViscosity::GidaspowViscosity(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::GidaspowViscosity::~GidaspowViscosity()
+Foam::kineticTheoryModels::GidaspowViscosity::~GidaspowViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::GidaspowViscosity::mua
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::GidaspowViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H

@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class GidaspowViscosity Declaration
@@ -53,19 +55,17 @@ class GidaspowViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("Gidaspow");
+    //- Runtime type information
+    TypeName("Gidaspow");
 
     // Constructors
 
-
         //- Construct from components
         GidaspowViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~GidaspowViscosity();
+    //- Destructor
+    virtual ~GidaspowViscosity();
 
 
     // Member functions
@@ -84,6 +84,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C

@@ -31,6 +31,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(HrenyaSinclairViscosity, 0);
 
@@ -41,11 +43,11 @@ namespace Foam
         dictionary
     );
 }
-
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::HrenyaSinclairViscosity::HrenyaSinclairViscosity
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::HrenyaSinclairViscosity
 (
     const dictionary& dict
 )
@@ -58,13 +60,14 @@ Foam::HrenyaSinclairViscosity::HrenyaSinclairViscosity
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::HrenyaSinclairViscosity::~HrenyaSinclairViscosity()
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::~HrenyaSinclairViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::HrenyaSinclairViscosity::mua
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::HrenyaSinclairViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H

@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class HrenyaSinclairViscosity Declaration
@@ -50,6 +52,7 @@ class HrenyaSinclairViscosity
 :
     public viscosityModel
 {
+    // Private data
 
         dictionary coeffsDict_;
 
@@ -59,8 +62,8 @@ class HrenyaSinclairViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("HrenyaSinclair");
+    //- Runtime type information
+    TypeName("HrenyaSinclair");
 
 
     // Constructors
@@ -69,9 +72,8 @@ public:
         HrenyaSinclairViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~HrenyaSinclairViscosity();
+    //- Destructor
+    virtual ~HrenyaSinclairViscosity();
 
 
     // Member functions
@@ -90,6 +92,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C

@@ -31,16 +31,21 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(SyamlalViscosity, 0);
-
     addToRunTimeSelectionTable(viscosityModel, SyamlalViscosity, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::SyamlalViscosity::SyamlalViscosity(const dictionary& dict)
+Foam::kineticTheoryModels::SyamlalViscosity::SyamlalViscosity
+(
+    const dictionary& dict
+)
 :
     viscosityModel(dict)
 {}
@@ -48,13 +53,13 @@ Foam::SyamlalViscosity::SyamlalViscosity(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::SyamlalViscosity::~SyamlalViscosity()
+Foam::kineticTheoryModels::SyamlalViscosity::~SyamlalViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::SyamlalViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::SyamlalViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H

@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class SyamlalViscosity Declaration
@@ -53,8 +55,9 @@ class SyamlalViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("Syamlal");
+    //- Runtime type information
+    TypeName("Syamlal");
+
 
     // Constructors
 
@@ -62,9 +65,8 @@ public:
         SyamlalViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~SyamlalViscosity();
+    //- Destructor
+    virtual ~SyamlalViscosity();
 
 
     // Member functions
@@ -83,6 +85,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.C

@@ -30,16 +30,17 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(noneViscosity, 0);
-
     addToRunTimeSelectionTable(viscosityModel, noneViscosity, dictionary);
 }
-
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::noneViscosity::noneViscosity(const dictionary& dict)
+Foam::kineticTheoryModels::noneViscosity::noneViscosity(const dictionary& dict)
 :
     viscosityModel(dict)
 {}
@@ -47,13 +48,13 @@ Foam::noneViscosity::noneViscosity(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::noneViscosity::~noneViscosity()
+Foam::kineticTheoryModels::noneViscosity::~noneViscosity()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::volScalarField> Foam::noneViscosity::mua
+Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::mua
 (
     const volScalarField& alpha,
     const volScalarField& Theta,

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H

@@ -41,6 +41,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class noneViscosity Declaration
@@ -53,19 +55,18 @@ class noneViscosity
 
 public:
 
-        //- Runtime type information
-        TypeName("none");
+    //- Runtime type information
+    TypeName("none");
+
 
     // Constructors
 
-
         //- Construct from components
         noneViscosity(const dictionary& dict);
 
 
-    // Destructor
-
-        ~noneViscosity();
+    //- Destructor
+    virtual ~noneViscosity();
 
 
     // Member functions
@@ -84,6 +85,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C

@@ -28,7 +28,8 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::viscosityModel> Foam::viscosityModel::New
+Foam::autoPtr<Foam::kineticTheoryModels::viscosityModel>
+Foam::kineticTheoryModels::viscosityModel::New
 (
     const dictionary& dict
 )

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C

@@ -29,15 +29,18 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace kineticTheoryModels
 {
     defineTypeNameAndDebug(viscosityModel, 0);
     defineRunTimeSelectionTable(viscosityModel, dictionary);
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::viscosityModel::viscosityModel
+Foam::kineticTheoryModels::viscosityModel::viscosityModel
 (
     const dictionary& dict
 )
@@ -48,7 +51,7 @@ Foam::viscosityModel::viscosityModel
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::viscosityModel::~viscosityModel()
+Foam::kineticTheoryModels::viscosityModel::~viscosityModel()
 {}
 
 

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H

@@ -44,6 +44,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace kineticTheoryModels
+{
 
 /*---------------------------------------------------------------------------*\
                            Class viscosityModel Declaration
@@ -99,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~viscosityModel();
+    //- Destructor
+    virtual ~viscosityModel();
 
 
     // Member Functions
@@ -120,6 +121,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace kineticTheoryModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.H

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

bin/foamTemplates/foamTemplate.H

@@ -107,9 +107,8 @@ public:
         static autoPtr<className> New();
 
 
-    // Destructor
-
-        ~className();
+    //- Destructor
+    ~className();
 
 
     // Member Functions