Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/lagrangian/dieselSpray/spray/findInjectorCell.H
This commit is contained in:
mattijs
2011-11-08 17:06:05 +00:00
215 changed files with 727 additions and 22962 deletions

View File

@ -11,7 +11,6 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \
-lconversion \
-ldecompositionMethods \
-ldieselSpray \
-ldistributed \
-ldistributionModels \
-ldsmc \

View File

@ -10,8 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/browser/lnInclude \
-I$(LIB_SRC)/foam/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
-lfiniteVolume \