Merge branch 'master' into werner-master
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/pe/rigidbody/StorageDataHandling.h 3 additions, 15 deletionssrc/pe/rigidbody/StorageDataHandling.h
- src/pe_coupling/utility/BodiesForceTorqueContainer.h 40 additions, 45 deletionssrc/pe_coupling/utility/BodiesForceTorqueContainer.h
- src/pe_coupling/utility/BodySelectorFunctions.cpp 50 additions, 0 deletionssrc/pe_coupling/utility/BodySelectorFunctions.cpp
- src/pe_coupling/utility/BodySelectorFunctions.h 9 additions, 20 deletionssrc/pe_coupling/utility/BodySelectorFunctions.h
- src/pe_coupling/utility/TimeStep.h 27 additions, 37 deletionssrc/pe_coupling/utility/TimeStep.h
- tests/core/timing/TimingTreeTest.cpp 25 additions, 1 deletiontests/core/timing/TimingTreeTest.cpp
- tests/pe/ParMetis.cpp 1 addition, 1 deletiontests/pe/ParMetis.cpp
- tests/pe/RigidBody.cpp 6 additions, 6 deletionstests/pe/RigidBody.cpp
- tests/pe/SimpleCCD.cpp 3 additions, 3 deletionstests/pe/SimpleCCD.cpp
Please register or sign in to comment