Skip to content

Commit

Permalink
initial release
Browse files Browse the repository at this point in the history
  • Loading branch information
TonkomoLLC committed Oct 9, 2018
1 parent c8dcacf commit 7d7a1e6
Show file tree
Hide file tree
Showing 576 changed files with 1,623,374 additions and 1 deletion.
21 changes: 21 additions & 0 deletions CFDEM-Compressible_Lagrangian_Library/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# CFDEM-Compressible_Lagrangian_Library

Creates liblagrangianCFDEMcomp-PUBLIC-X.Y.so

# Background
- creates a compressible lagrangian library for the CFDEM cloud
- the source terms from CFDEM will then be in the right units for OpenFOAM compressible transport equations
- you can find the code that is modified for compressible solvers with the command

```
grep -r "compre" *
```

# Pre-requisites
- CFDEM 3.8.0
- LIGGGHTS 3.8.0

# Instructions
- place direcotry in `$CFDEM_SRC_DIR/lagrangian`
- type `wclean` then `wmake` in the cfdemParticleComp directory

131 changes: 131 additions & 0 deletions CFDEM-Compressible_Lagrangian_Library/cfdemParticleComp/Make/files
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
path = ../cfdemParticle
cfdemCloud = $(path)/cfdemCloud
derived = $(path)/derived
cfdTools = $(path)/cfdTools
forceModels = $(path)/subModels/forceModel
forceSubModels = $(path)/subModels/forceModel/forceSubModels
forceModelsMS = $(path)/subModels/forceModelMS
IOModels = $(path)/subModels/IOModel
voidFractionModels = $(path)/subModels/voidFractionModel
voidFractionModelsMS = $(path)/subModels/voidFractionModelMS
locateModels = $(path)/subModels/locateModel
meshMotionModels = $(path)/subModels/meshMotionModel
momCoupleModels = $(path)/subModels/momCoupleModel
dataExchangeModels = $(path)/subModels/dataExchangeModel
averagingModels = $(path)/subModels/averagingModel
clockModels = $(path)/subModels/clockModel
liggghtsCommandModels = $(path)/subModels/liggghtsCommandModel
smoothingModels = $(path)/subModels/smoothingModel
probeModels = $(path)/subModels/probeModel
registryModels = $(path)/subModels/registryModel
absorptionEmissionModels = $(path)/subModels/absorptionEmissionModels


$(cfdemCloud)/cfdemCloud.C
$(derived)/cfdemCloudIB/cfdemCloudIB.C

$(cfdTools)/global.C
$(cfdTools)/IOtools/json/json.C
$(cfdTools)/newGlobal.C

$(averagingModels)/averagingModel/averagingModel.C
$(averagingModels)/averagingModel/newAveragingModel.C
$(averagingModels)/dense/dense.C
$(averagingModels)/dilute/dilute.C

$(clockModels)/clockModel/clockModel.C
$(clockModels)/clockModel/newClockModel.C
$(clockModels)/noClock/noClock.C
$(clockModels)/standardClock/standardClock.C

$(dataExchangeModels)/dataExchangeModel/dataExchangeModel.C
$(dataExchangeModels)/dataExchangeModel/newDataExchangeModel.C
$(dataExchangeModels)/noDataExchange/noDataExchange.C
$(dataExchangeModels)/oneWayVTK/oneWayVTK.C
$(dataExchangeModels)/twoWayFiles/twoWayFiles.C
$(dataExchangeModels)/twoWayMPI/twoWayMPI.C

$(forceModels)/Archimedes/Archimedes.C
$(forceModels)/ArchimedesIB/ArchimedesIB.C
$(forceModels)/checkCouplingInterval/checkCouplingInterval.C
$(forceModels)/DiFeliceDrag/DiFeliceDrag.C
$(forceModels)/fieldStore/fieldStore.C
$(forceModels)/fieldTimeAverage/fieldTimeAverage.C
$(forceModels)/forceModel/forceModel.C
$(forceModels)/forceModel/newForceModel.C
$(forceModels)/GidaspowDrag/GidaspowDrag.C
$(forceModels)/gradPForce/gradPForce.C
$(forceModels)/interface/interface.C
$(forceModels)/KochHillDrag/KochHillDrag.C
$(forceModels)/LaEuScalarTemp/LaEuScalarTemp.C
$(forceModels)/MeiLift/MeiLift.C
$(forceModels)/noDrag/noDrag.C
$(forceModels)/particleCellVolume/particleCellVolume.C
$(forceModels)/particleVolume/particleVolume.C
$(forceModels)/scalarGeneralExchange/scalarGeneralExchange.C
$(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C
$(forceModels)/ShirgaonkarIB/ShirgaonkarIB.C
$(forceModels)/virtualMassForce/virtualMassForce.C
$(forceModels)/viscForce/viscForce.C
$(forceModels)/volWeightedAverage/volWeightedAverage.C

$(forceSubModels)/forceSubModel/forceSubModel.C
$(forceSubModels)/forceSubModel/newForceSubModel.C
$(forceSubModels)/ImEx/ImEx.C

$(IOModels)/basicIO/basicIO.C
$(IOModels)/IOModel/IOModel.C
$(IOModels)/IOModel/newIOModel.C
$(IOModels)/noIO/noIO.C
$(IOModels)/sophIO/sophIO.C
$(IOModels)/trackIO/trackIO.C

$(liggghtsCommandModels)/execute/execute.C
$(liggghtsCommandModels)/liggghtsCommandModel/liggghtsCommandModel.C
$(liggghtsCommandModels)/liggghtsCommandModel/newLiggghtsCommandModel.C
$(liggghtsCommandModels)/readLiggghtsData/readLiggghtsData.C
$(liggghtsCommandModels)/runLiggghts/runLiggghts.C
$(liggghtsCommandModels)/setDEMGravity/setDEMGravity.C
$(liggghtsCommandModels)/writeLiggghts/writeLiggghts.C

$(locateModels)/engineSearch/engineSearch.C
$(locateModels)/engineSearchIB/engineSearchIB.C
$(locateModels)/locateModel/locateModel.C
$(locateModels)/locateModel/newLocateModel.C
$(locateModels)/standardSearch/standardSearch.C

$(meshMotionModels)/meshMotionModel/meshMotionModel.C
$(meshMotionModels)/meshMotionModel/newMeshMotionModel.C
$(meshMotionModels)/noMeshMotion/noMeshMotion.C

$(momCoupleModels)/explicitCouple/explicitCouple.C
$(momCoupleModels)/implicitCouple/implicitCouple.C
$(momCoupleModels)/momCoupleModel/momCoupleModel.C
$(momCoupleModels)/momCoupleModel/newMomCoupleModel.C
$(momCoupleModels)/noCouple/noCouple.C

$(probeModels)/noProbe/noProbe.C
$(probeModels)/particleProbe/particleProbe.C
$(probeModels)/probeModel/newProbeModel.C
$(probeModels)/probeModel/probeModel.C

$(registryModels)/defaultRegistry/defaultRegistry.C
$(registryModels)/registryModel/newRegistryModel.C
$(registryModels)/registryModel/registryModel.C

$(smoothingModels)/constDiffSmoothing/constDiffSmoothing.C
$(smoothingModels)/noSmoothing/noSmoothing.C
$(smoothingModels)/smoothingModel/newSmoothingModel.C
$(smoothingModels)/smoothingModel/smoothingModel.C

$(voidFractionModels)/bigParticleVoidFraction/bigParticleVoidFraction.C
$(voidFractionModels)/centreVoidFraction/centreVoidFraction.C
$(voidFractionModels)/dividedVoidFraction/dividedVoidFraction.C
$(voidFractionModels)/GaussVoidFraction/GaussVoidFraction.C
$(voidFractionModels)/IBVoidFraction/IBVoidFraction.C
$(voidFractionModels)/noVoidFraction/noVoidFraction.C
$(voidFractionModels)/trilinearVoidFraction/trilinearVoidFraction.C
$(voidFractionModels)/voidFractionModel/newVoidFractionModel.C
$(voidFractionModels)/voidFractionModel/voidFractionModel.C

LIB = $(CFDEM_LIB_DIR)/lib$(CFDEM_LIB_COMP_NAME)
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*NOTE: for compiling the lnInclude of cfdemParticle is needed (exist after wmake libso of cfdemParticle)*/
/*BUT: the *.dep files of cfdemParticle MUST NOT EXIST (do an rmdepall of of cfdemParticle)*/

sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)

GIT_VERSION := $(shell git describe --dirty --always --tags)
PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\"
PFLAGS+= -DDEBUGFLAG=\"$(WM_COMPILE_OPTION)\"
PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)"
PFLAGS+= -Dcompre

include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME)

EXE_INC = \
$(PFLAGS) \
$(PINC) \
-I ../cfdemParticle/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \
$(CFDEM_ADD_COMPTURBMOD_PATHS) \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/OpenFOAM/containers/HashTables/labelHashSet \
-I$(CFDEM_LIGGGHTS_SRC_DIR) \
-I$(CFDEM_SRC_DIR)/cfdTools \

LIB_LIBS = \
$(PLIBS) \
-L$(CFDEM_LIB_DIR) \
-lfiniteVolume \
$(CFDEM_ADD_COMPTURBMOD_LIBS) \
-lfluidThermophysicalModels \
-lmeshTools \
-llagrangian \
-Wl,--whole-archive -l$(CFDEM_LIGGGHTS_LIB_NAME) -Wl,--no-whole-archive \
$(CFDEM_ADD_LIB_PATHS) \
$(CFDEM_ADD_STATICLIBS)
Loading

0 comments on commit 7d7a1e6

Please sign in to comment.