Merge with upstream master
Showing
- .gitlab-ci.yml 35 additions, 428 deletions.gitlab-ci.yml
- CMakeLists.txt 92 additions, 49 deletionsCMakeLists.txt
- README.md 1 addition, 1 deletionREADME.md
- apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp 2 additions, 2 deletions...arPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
- apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp 2 additions, 2 deletionsapps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp
- apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp 10 additions, 10 deletions...marks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp
- apps/benchmarks/SchaeferTurek/SchaeferTurek.cpp 2 additions, 2 deletionsapps/benchmarks/SchaeferTurek/SchaeferTurek.cpp
- apps/benchmarks/UniformGrid/UniformGrid.cpp 2 additions, 2 deletionsapps/benchmarks/UniformGrid/UniformGrid.cpp
- apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp 12 additions, 12 deletions...ases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
- apps/tools/povrayFileCompressor/main.cpp 17 additions, 18 deletionsapps/tools/povrayFileCompressor/main.cpp
- apps/tutorials/pe/02_ConfinedGasExtended.cpp 2 additions, 2 deletionsapps/tutorials/pe/02_ConfinedGasExtended.cpp
- cmake/CMakeParseArgumentsCompat.cmake 0 additions, 138 deletionscmake/CMakeParseArgumentsCompat.cmake
- cmake/TestStdAny.cpp 16 additions, 0 deletionscmake/TestStdAny.cpp
- cmake/TestStdFilesystem.cpp 16 additions, 0 deletionscmake/TestStdFilesystem.cpp
- cmake/TestStdOptional.cpp 19 additions, 0 deletionscmake/TestStdOptional.cpp
- cmake/waLBerlaFunctions.cmake 3 additions, 0 deletionscmake/waLBerlaFunctions.cmake
- python/waLBerla/core_extension.py 6 additions, 3 deletionspython/waLBerla/core_extension.py
- python/waLBerla/cuda_extension.py 13 additions, 2 deletionspython/waLBerla/cuda_extension.py
- python/waLBerla/field_extension.py 27 additions, 21 deletionspython/waLBerla/field_extension.py
- src/blockforest/Block.cpp 1 addition, 1 deletionsrc/blockforest/Block.cpp
Please register or sign in to comment