mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
fix compilation of cfdemPostproc for OpenFOAM 4.0
update to OpenFOAM 4.0 turbulence model
This commit is contained in:
@ -1,7 +1,8 @@
|
|||||||
include $(CFDEM_ADD_LIBS_DIR)/additionalLibs
|
include $(CFDEM_ADD_LIBS_DIR)/additionalLibs
|
||||||
|
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
-I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
|
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
|
||||||
|
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
|
||||||
-I$(LIB_SRC)/transportModels \
|
-I$(LIB_SRC)/transportModels \
|
||||||
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
|
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
|
||||||
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
||||||
@ -11,8 +12,8 @@ EXE_INC = \
|
|||||||
|
|
||||||
EXE_LIBS = \
|
EXE_LIBS = \
|
||||||
-L$(CFDEM_LIB_DIR)\
|
-L$(CFDEM_LIB_DIR)\
|
||||||
-lincompressibleRASModels \
|
-lturbulenceModels \
|
||||||
-lincompressibleLESModels \
|
-lincompressibleTurbulenceModels \
|
||||||
-lincompressibleTransportModels \
|
-lincompressibleTransportModels \
|
||||||
-lfiniteVolume \
|
-lfiniteVolume \
|
||||||
-l$(CFDEM_LIB_NAME) \
|
-l$(CFDEM_LIB_NAME) \
|
||||||
|
|||||||
@ -33,7 +33,7 @@ Description
|
|||||||
|
|
||||||
#include "fvCFD.H"
|
#include "fvCFD.H"
|
||||||
#include "singlePhaseTransportModel.H"
|
#include "singlePhaseTransportModel.H"
|
||||||
#include "turbulenceModel.H"
|
#include "turbulentTransportModel.H"
|
||||||
|
|
||||||
#include "cfdemCloud.H"
|
#include "cfdemCloud.H"
|
||||||
#include "dataExchangeModel.H"
|
#include "dataExchangeModel.H"
|
||||||
@ -109,7 +109,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
particleCloud.voidFractionM().setvoidFraction(NULL,voidfractions_,particleWeights_,particleVolumes_,particleV_);
|
particleCloud.voidFractionM().setvoidFraction(NULL,voidfractions_,particleWeights_,particleVolumes_,particleV_);
|
||||||
|
|
||||||
voidfraction.internalField() = particleCloud.voidFractionM().voidFractionInterp();
|
voidfraction.ref() = particleCloud.voidFractionM().voidFractionInterp();
|
||||||
voidfraction.correctBoundaryConditions();
|
voidfraction.correctBoundaryConditions();
|
||||||
|
|
||||||
particleCloud.averagingM().setVectorAverage
|
particleCloud.averagingM().setVectorAverage
|
||||||
|
|||||||
Reference in New Issue
Block a user