Merge branch 'master' into 'geometry_utils'
# Conflicts: # tests/pe_coupling/CMakeLists.txt
Showing
- 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_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_coupling/CMakeLists.txt 14 additions, 1 deletiontests/pe_coupling/CMakeLists.txt
- tests/pe_coupling/utility/BodiesForceTorqueContainerTest.cpp 487 additions, 0 deletionstests/pe_coupling/utility/BodiesForceTorqueContainerTest.cpp
- tests/pe_coupling/utility/PeSubCyclingTest.cpp 455 additions, 0 deletionstests/pe_coupling/utility/PeSubCyclingTest.cpp
Please register or sign in to comment