Merge branch 'master' into fluidizedbed_showcase
Showing
- .gitlab-ci.yml 2 additions, 2 deletions.gitlab-ci.yml
- apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp 2 additions, 2 deletionsapps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
- src/blockforest/AABBRefinementSelection.h 57 additions, 17 deletionssrc/blockforest/AABBRefinementSelection.h
- src/blockforest/BlockForest.h 56 additions, 0 deletionssrc/blockforest/BlockForest.h
- src/blockforest/loadbalancing/DynamicParMetis.cpp 32 additions, 35 deletionssrc/blockforest/loadbalancing/DynamicParMetis.cpp
- src/blockforest/loadbalancing/DynamicParMetis.h 41 additions, 11 deletionssrc/blockforest/loadbalancing/DynamicParMetis.h
- src/blockforest/loadbalancing/all.h 3 additions, 0 deletionssrc/blockforest/loadbalancing/all.h
- src/core/timing/TimingNode.h 26 additions, 1 deletionsrc/core/timing/TimingNode.h
- src/core/timing/TimingTree.h 16 additions, 5 deletionssrc/core/timing/TimingTree.h
- src/field/allocation/FieldAllocator.h 1 addition, 1 deletionsrc/field/allocation/FieldAllocator.h
- src/field/python/FieldExport.impl.h 89 additions, 18 deletionssrc/field/python/FieldExport.impl.h
- src/geometry/bodies/AABBBody.h 4 additions, 5 deletionssrc/geometry/bodies/AABBBody.h
- src/geometry/bodies/BodyOverlapFunctions.h 6 additions, 6 deletionssrc/geometry/bodies/BodyOverlapFunctions.h
- src/geometry/bodies/BodyOverlapFunctions.impl.h 23 additions, 14 deletionssrc/geometry/bodies/BodyOverlapFunctions.impl.h
- src/geometry/bodies/DynamicBody.h 4 additions, 3 deletionssrc/geometry/bodies/DynamicBody.h
- src/geometry/bodies/Ellipsoid.cpp 5 additions, 4 deletionssrc/geometry/bodies/Ellipsoid.cpp
- src/geometry/bodies/Ellipsoid.h 1 addition, 1 deletionsrc/geometry/bodies/Ellipsoid.h
- src/geometry/bodies/Sphere.cpp 4 additions, 3 deletionssrc/geometry/bodies/Sphere.cpp
- src/geometry/bodies/Sphere.h 1 addition, 1 deletionsrc/geometry/bodies/Sphere.h
- src/geometry/initializer/OverlapFieldFromBody.h 2 additions, 1 deletionsrc/geometry/initializer/OverlapFieldFromBody.h
Please register or sign in to comment