Porting: Windows file name clash viscosityModel.H. Cesare Guardino

applications/solvers/multiphase/twoPhaseEulerFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(FOAM_APP)/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -IturbulenceModel \

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files

@@ -1,7 +1,7 @@
 kineticTheoryModel/kineticTheoryModel.C
 
-viscosityModel/viscosityModel/viscosityModel.C
-viscosityModel/viscosityModel/newViscosityModel.C
+viscosityModel/viscosityModel/kineticTheoryViscosityModel.C
+viscosityModel/viscosityModel/newKineticTheoryViscosityModel.C
 viscosityModel/Gidaspow/GidaspowViscosity.C
 viscosityModel/Syamlal/SyamlalViscosity.C
 viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C

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

@@ -37,7 +37,7 @@ SourceFiles
 #include "dragModel.H"
 #include "phaseModel.H"
 #include "autoPtr.H"
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 #include "conductivityModel.H"
 #include "radialModel.H"
 #include "granularPressureModel.H"

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

@@ -34,7 +34,7 @@ SourceFiles
 #ifndef GidaspowViscosity_H
 #define GidaspowViscosity_H
 
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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

@@ -34,7 +34,7 @@ SourceFiles
 #ifndef HrenyaSinclairViscosity_H
 #define HrenyaSinclairViscosity_H
 
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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

@@ -34,7 +34,7 @@ SourceFiles
 #ifndef SyamlalViscosity_H
 #define SyamlalViscosity_H
 
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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

@@ -34,7 +34,7 @@ SourceFiles
 #ifndef noneViscosity_H
 #define noneViscosity_H
 
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

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

@@ -24,6 +24,9 @@ License
 Class
     Foam::viscosityModel
 
+Namespace
+    Foam::kineticTheoryModels
+
 Description
 
 SourceFiles
@@ -31,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef viscosityModel_H
-#define viscosityModel_H
+#ifndef kineticTheoryViscosityModel_H
+#define kineticTheoryViscosityModel_H
 
 #include "dictionary.H"
 #include "volFields.H"

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

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "viscosityModel.H"
+#include "kineticTheoryViscosityModel.H"
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //