resolved Conflicts: - applications/solvers/cfdemSolverIB/Make/options - etc/solver-list.txt - src/lagrangian/cfdemParticle/Make/files - src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C resolved Issues: src/lagrangian/cfdemParticle/subModels/ShirgaonkarIBTorque/ShirgaonkarIBTorque.C
35 lines
1.1 KiB
Plaintext
Executable File
35 lines
1.1 KiB
Plaintext
Executable File
include $(CFDEM_ADD_LIBS_DIR)/additionalLibs
|
|
|
|
EXE_INC = \
|
|
-I$(CFDEM_OFVERSION_DIR) \
|
|
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
|
-I$(LIB_SRC)/meshTools/lnInclude \
|
|
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
|
|
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
|
|
-I$(LIB_SRC)/transportModels \
|
|
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
|
|
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
|
|
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
|
|
-I$(LIB_SRC)/dynamicMesh/lnInclude \
|
|
-I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
|
|
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
|
|
-I$(LIB_SRC)/fvOptions/lnInclude \
|
|
-I$(LIB_SRC)/sampling/lnInclude \
|
|
-Wno-deprecated-copy
|
|
|
|
EXE_LIBS = \
|
|
-L$(CFDEM_LIB_DIR)\
|
|
-lturbulenceModels \
|
|
-lincompressibleTurbulenceModels \
|
|
-lincompressibleTransportModels \
|
|
-lfiniteVolume \
|
|
-lmeshTools \
|
|
-ldynamicFvMesh \
|
|
-ldynamicMesh \
|
|
-lfvOptions \
|
|
-lsampling \
|
|
-l$(CFDEM_LIB_NAME) \
|
|
$(CFDEM_ADD_LIB_PATHS) \
|
|
$(CFDEM_ADD_LIBS)
|
|
|