Merge branch 'master' into clang-tidy
Showing
- .clang-format 14 additions, 10 deletions.clang-format
- .gitlab-ci.yml 1 addition, 0 deletions.gitlab-ci.yml
- apps/benchmarks/CMakeLists.txt 2 additions, 0 deletionsapps/benchmarks/CMakeLists.txt
- apps/benchmarks/FluidParticleCoupling/CMakeLists.txt 1 addition, 3 deletionsapps/benchmarks/FluidParticleCoupling/CMakeLists.txt
- apps/benchmarks/FluidizedBed/CMakeLists.txt 6 additions, 0 deletionsapps/benchmarks/FluidizedBed/CMakeLists.txt
- apps/benchmarks/FluidizedBed/FluidizedBedGPU.cpp 841 additions, 0 deletionsapps/benchmarks/FluidizedBed/FluidizedBedGPU.cpp
- apps/benchmarks/FluidizedBed/input.prm 54 additions, 0 deletionsapps/benchmarks/FluidizedBed/input.prm
- apps/benchmarks/Percolation/CMakeLists.txt 9 additions, 0 deletionsapps/benchmarks/Percolation/CMakeLists.txt
- apps/benchmarks/Percolation/Percolation.cpp 507 additions, 0 deletionsapps/benchmarks/Percolation/Percolation.cpp
- apps/benchmarks/Percolation/benchmark.prm 42 additions, 0 deletionsapps/benchmarks/Percolation/benchmark.prm
- apps/showcases/CMakeLists.txt 1 addition, 0 deletionsapps/showcases/CMakeLists.txt
- apps/showcases/Piping/CMakeLists.txt 5 additions, 0 deletionsapps/showcases/Piping/CMakeLists.txt
- apps/showcases/Piping/SettlingSpheres.cpp 300 additions, 0 deletionsapps/showcases/Piping/SettlingSpheres.cpp
- apps/showcases/Piping/setups/CMakeLists.txt 1 addition, 0 deletionsapps/showcases/Piping/setups/CMakeLists.txt
- apps/showcases/Piping/setups/SettlingSpheres_Fukumoto.prm 21 additions, 0 deletionsapps/showcases/Piping/setups/SettlingSpheres_Fukumoto.prm
- apps/showcases/Piping/utility/ParticleUtility.h 306 additions, 0 deletionsapps/showcases/Piping/utility/ParticleUtility.h
- python/mesa_pd.py 9 additions, 0 deletionspython/mesa_pd.py
- python/mesa_pd/templates/common/ParticleFunctions.templ.h 12 additions, 12 deletionspython/mesa_pd/templates/common/ParticleFunctions.templ.h
- python/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h 13 additions, 1 deletionpython/mesa_pd/templates/kernel/LinearSpringDashpot.templ.h
- src/core/math/extern/exprtk.h 12799 additions, 6802 deletionssrc/core/math/extern/exprtk.h
Please register or sign in to comment