Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lbm dem psm #7

Open
wants to merge 36 commits into
base: feature/LBMDEMCoupling
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0c832f8
Merge pull request #1 from jpmeng:NewMultiBlock
jpmeng Apr 25, 2021
c7a98e6
Add CMake support for the developing mode
jpmeng May 4, 2021
d03fc7f
Add CMake support for the developing mode
jpmeng May 6, 2021
fd97dcf
Add CMake support for the CUDA
jpmeng May 8, 2021
b708f7a
Python functions for installing dependency
jpmeng May 8, 2021
6a57b29
Script for the HDF5 library
jpmeng May 8, 2021
76068e9
Make the CMake system suitable for non-lbm code
jpmeng May 9, 2021
0dfae0a
Improve the warning message of the CMake system
jpmeng May 10, 2021
5778657
Add diagnostic_output() into the Cavity3D app
jpmeng May 10, 2021
9f9ebde
Minor fix to the field module
jpmeng May 10, 2021
c96e28c
Merge pull request #2 from jpmeng/CMakeSupport
jpmeng May 12, 2021
19dddaf
Revise model module for 2D code
jpmeng May 15, 2021
4cc5c32
Remove unnecessary ops_pritnf from model.cpp
jpmeng May 15, 2021
7cf0001
Revsie scheme module for 2D code
jpmeng May 15, 2021
8189d4d
Revise flowfield module for 2D code
jpmeng May 15, 2021
10c5c59
Further minor revision on model module
jpmeng May 15, 2021
4e1b44e
Revise boudnary module for 2D code
jpmeng May 15, 2021
590f95a
Revise evolution module for both 2D and 3D
jpmeng May 15, 2021
2d94a8c
Revise CMakefile for new evolution
jpmeng May 15, 2021
f8c72d9
Fix further compiling error
jpmeng May 15, 2021
fd24b2c
Add 2DCavity app
jpmeng May 15, 2021
e5c49ac
Modify CMakefile for 2D develop mode
jpmeng May 15, 2021
0429682
Fix minor error of 2D reading in PostProcess
jpmeng May 15, 2021
13a8f21
Add 2D support to CMake Optimise mode
jpmeng May 15, 2021
bcce26f
Merge branch 'feature/2DLatticeBoltzmann' into develop
jpmeng May 15, 2021
3a2673b
Adding LBM-DEM
vtsinginos May 23, 2021
ba58ac6
Adding fixes required for LAMMPS
vtsinginos May 23, 2021
5d7bdf2
remove mui files
vtsinginos May 23, 2021
066a3e8
Merge pull request #3 from vtsinginos/DEM-LBM
jpmeng May 23, 2021
e10f349
Adding the latest implementation of PRATI
vtsinginos May 27, 2021
69cafc5
Files added before compile
vtsinginos Jun 14, 2021
78d3b12
The code is running
vtsinginos Jun 28, 2021
90264ee
LBM-DEM
vtsinginos Jul 1, 2021
6d4fbbc
LBM-DEM with the PSM
vtsinginos Jul 1, 2021
9983778
Renaming collision-component function
vtsinginos Jul 1, 2021
b16fcce
Merge branch 'feature/LBMDEMCoupling' into LBM-DEM-PSM
vtsinginos Jul 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions Apps/2DCavity/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

cmake_minimum_required(VERSION 3.18)
set(AppName Cavity2D)
set(AppSrc lbm2d_cavity.cpp)
set(LibSrc evolution.cpp scheme.cpp scheme_wrapper.cpp configuration.cpp model.cpp model_wrapper.cpp block.cpp flowfield.cpp flowfield_wrapper.cpp boundary.cpp boundary_wrapper.cpp)
set(LibHeadList type.h flowfield_host_device.h boundary_host_device.h model_host_device.h)
set(SpaceDim 2)
if (NOT OPTIMISE)
# Set the path for LibSrc
set(LibSrcPath "")
foreach(Src IN LISTS LibSrc)
list(APPEND LibSrcPath ${LibDir}/${Src})
endforeach(Src IN LISTS LibSrc)
SeqDevTarget("${SpaceDim}" 0)
MpiDevTarget("${SpaceDim}" 0)
else()
#set the files needed to be translated by ops.py from the app side
set(AppSrcGenList lbm2d_cavity.cpp)
set(AppKernelGenList cavity2d_kernel.inc)
set(AppHeadList "")
CreateTempDir()
set(TMP_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/tmp)
set(HeadList ${LibHeadList} ${AppHeadList})
WriteJsonConfig(${TMP_SOURCE_DIR} ${AppName} "${LibSrc}" "${AppSrcGenList}" "${AppKernelGenList}" "${HeadList}" ${SpaceDim})
TranslateSourceCodes(${LibDir} "${LibSrcGenList}" "${AppSrcGenList}" ${TMP_SOURCE_DIR})
SeqTarget("${SpaceDim}")
MpiTarget("${SpaceDim}")
CudaTarget("${SpaceDim}")
endif ()
95 changes: 95 additions & 0 deletions Apps/2DCavity/Cavity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{

"CaseName": "Cavity",
"SpaceDim": 3,
"CompoNames": ["Fluid"],
"CompoIds": [0],
"LatticeName":["d3q19"],
"MacroVarNames":["rho","u","v","w"],
"MacroVarIds":[0,1,2,3],
"MacroCompoIds":[0,0,0,0],
"MacroVarTypes":["Variable_Rho","Variable_U","Variable_V","Variable_W"],
"CollisionType":["Collision_BGKIsothermal2nd"],
"CollisionCompoIds":[0],
"InitialType":["Initial_BGKFeq2nd"],
"InitialCompoIds":[0],
"BodyForceType":["BodyForce_None"],
"BodyForceCompoId":[0],
"SchemeType":"Scheme_StreamCollision",

"BoundaryCondition0":{
"BlockIndex": 0,
"ComponentId": 0,
"GivenVars":[0.01,0,0],
"BoundarySurface":"Top",
"BoundaryScheme": "EQMDiffuseREfl",
"BoundaryType": "Wall",
"MacroVarTypesatBoundary": ["Variable_U","Variable_V","Variable_W"]

},

"BoundaryCondition1":{
"BlockIndex": 0,
"ComponentId": 0,
"GivenVars":[0,0,0],
"BoundarySurface":"Bottom",
"BoundaryScheme": "EQMDiffuseREfl",
"BoundaryType": "Wall",
"MacroVarTypesatBoundary": ["Variable_U","Variable_V","Variable_W"]

},

"BoundaryCondition2":{
"BlockIndex": 0,
"ComponentId": 0,
"GivenVars":[0.0,0,0],
"BoundarySurface":"Left",
"BoundaryScheme": "EQMDiffuseREfl",
"BoundaryType": "Wall",
"MacroVarTypesatBoundary": ["Variable_U","Variable_V","Variable_W"]

},

"BoundaryCondition3":{
"BlockIndex": 0,
"ComponentId": 0,
"GivenVars":[0,0,0],
"BoundarySurface":"Right",
"BoundaryScheme": "EQMDiffuseREfl",
"BoundaryType": "Wall",
"MacroVarTypesatBoundary": ["Variable_U","Variable_V","Variable_W"]

},

"BoundaryCondition4":{
"BlockIndex": 0,
"ComponentId": 0,
"GivenVars":[0,0,0],
"BoundarySurface":"Front",
"BoundaryScheme": "EQMDiffuseREfl",
"BoundaryType": "Wall",
"MacroVarTypesatBoundary": ["Variable_U","Variable_V","Variable_W"]

},

"BoundaryCondition5":{
"BlockIndex": 0,
"ComponentId": 0,
"GivenVars":[0,0,0],
"BoundarySurface":"Back",
"BoundaryScheme": "EQMDiffuseREfl",
"BoundaryType": "Wall",
"MacroVarTypesatBoundary": ["Variable_U","Variable_V","Variable_W"]

},

"BlockNum": 1,
"BlockSize":[33,33,33],
"MeshSize":0.03125,
"StartPos":[0,0,0],
"TauRef": [0.01],
"Transient": false,
"TimeSteps": 3,
"ConvergenceCriteria":1e-8,
"CheckPeriod":1000
}
Loading