exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Hrvoje Jasak 2016-06-08 12:26:43 +01:00
parent 6ba388f169
commit 13e477e311
10 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
View file

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

4
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/none/noneViscosity.H
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C
View file

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

7
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H
View file

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

2
applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C → applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newKineticTheoryViscosityModel.C
View file

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