songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

driftFluxFoam: Updated base-class of incompressibleTwoPhaseInteractingMixture

Browse Source
This commit is contained in:
Henry 2015-02-17 23:58:44 +00:00
parent 945c4c3d18
commit 2f27d6bba6
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
applications/solvers/multiphase/driftFluxFoam/Make/options
View File

@ -1,17 +1,16 @@
EXE_INC = \ EXE_INC = \
-IincompressibleTwoPhaseInteractingMixture \ -IincompressibleTwoPhaseInteractingMixture \
-ImixtureViscosityModels/lnInclude \ -ImixtureViscosityModels/lnInclude \
-I./relativeVelocityModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
-I./relativeVelocityModels/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ldriftFluxTransportModels \ -ldriftFluxTransportModels \
@ -20,6 +19,6 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lsampling \ -lsampling \
-lfvOptions \ -lfvOptions \
-lincompressibleTransportModels \ -lcompressibleTransportModels \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels

4
applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H
View File

@ -37,7 +37,7 @@ SourceFiles
#ifndef incompressibleTwoPhaseInteractingMixture_H #ifndef incompressibleTwoPhaseInteractingMixture_H
#define incompressibleTwoPhaseInteractingMixture_H #define incompressibleTwoPhaseInteractingMixture_H
#include "incompressible/transportModel/transportModel.H" #include "compressibleTransportModel.H"
#include "incompressible/viscosityModels/viscosityModel/viscosityModel.H" #include "incompressible/viscosityModels/viscosityModel/viscosityModel.H"
#include "mixtureViscosityModel.H" #include "mixtureViscosityModel.H"
#include "twoPhaseMixture.H" #include "twoPhaseMixture.H"
@ -56,7 +56,7 @@ namespace Foam
class incompressibleTwoPhaseInteractingMixture class incompressibleTwoPhaseInteractingMixture
: :
public IOdictionary, public IOdictionary,
public transportModel, public compressibleTransportModel,
public twoPhaseMixture public twoPhaseMixture
{ {
protected: protected:

5
applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options
View File

@ -3,9 +3,8 @@ EXE_INC = \
-I../mixtureViscosityModels/lnInclude \ -I../mixtureViscosityModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \