DEME 0.3.3__tar.gz → 0.3.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (497) hide show
  1. {DEME-0.3.3 → DEME-0.3.5/DEME.egg-info}/PKG-INFO +1 -1
  2. {DEME-0.3.3/DEME.egg-info → DEME-0.3.5}/PKG-INFO +1 -1
  3. {DEME-0.3.3 → DEME-0.3.5}/README.md +9 -2
  4. {DEME-0.3.3 → DEME-0.3.5}/packaging_instructions.txt +1 -1
  5. {DEME-0.3.3 → DEME-0.3.5}/setup.py +1 -1
  6. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/BdrsAndObjs.h +13 -1
  7. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/PyDEME.cpp +14 -1
  8. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/Structs.h +6 -0
  9. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_BallDrop.py +3 -3
  10. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_Centrifuge.py +7 -5
  11. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_ConePenetration.py +13 -12
  12. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_Electrostatic.py +2 -2
  13. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_FlexibleMesh.py +11 -12
  14. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_GRCPrep_Part1.py +3 -2
  15. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_GameOfLife.py +2 -2
  16. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_Mixer.py +6 -5
  17. {DEME-0.3.3 → DEME-0.3.5}/src/demo/pyDEME_WheelDPSimplified.py +7 -5
  18. {DEME-0.3.3 → DEME-0.3.5}/CMakeLists.txt +0 -0
  19. {DEME-0.3.3 → DEME-0.3.5}/DEME.egg-info/SOURCES.txt +0 -0
  20. {DEME-0.3.3 → DEME-0.3.5}/DEME.egg-info/dependency_links.txt +0 -0
  21. {DEME-0.3.3 → DEME-0.3.5}/DEME.egg-info/not-zip-safe +0 -0
  22. {DEME-0.3.3 → DEME-0.3.5}/DEME.egg-info/requires.txt +0 -0
  23. {DEME-0.3.3 → DEME-0.3.5}/DEME.egg-info/top_level.txt +0 -0
  24. {DEME-0.3.3 → DEME-0.3.5}/LICENSE.md +0 -0
  25. {DEME-0.3.3 → DEME-0.3.5}/MANIFEST.in +0 -0
  26. {DEME-0.3.3 → DEME-0.3.5}/cmake/CudaSupportedArchitectures.cmake +0 -0
  27. {DEME-0.3.3 → DEME-0.3.5}/cmake/CxxStdAutodetect.cmake +0 -0
  28. {DEME-0.3.3 → DEME-0.3.5}/cmake/DEMEConfig.cmake.in +0 -0
  29. {DEME-0.3.3 → DEME-0.3.5}/cmake/FixNinjaColors.cmake +0 -0
  30. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/3_clump.csv +0 -0
  31. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/6_clump.csv +0 -0
  32. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/TeddyBear.csv +0 -0
  33. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/ViperWheelSimple.csv +0 -0
  34. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/ellipsoid_2_1_1.csv +0 -0
  35. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/molecule.csv +0 -0
  36. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/spiky_sphere.csv +0 -0
  37. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/triangular_flat.csv +0 -0
  38. {DEME-0.3.3 → DEME-0.3.5}/data/clumps/triangular_flat_6comp.csv +0 -0
  39. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/GPBR_Vessel_Fine.obj +0 -0
  40. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/cone.obj +0 -0
  41. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/cube.obj +0 -0
  42. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/cyl_r1_h2.obj +0 -0
  43. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/excavator.obj +0 -0
  44. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/funnel.obj +0 -0
  45. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/hourglass.obj +0 -0
  46. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/hourglass_cap.obj +0 -0
  47. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/internal_mixer.obj +0 -0
  48. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/plane_20by20.obj +0 -0
  49. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/rover_wheels/curiosity_wheel.obj +0 -0
  50. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/rover_wheels/curiosity_wheel_surface.obj +0 -0
  51. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/rover_wheels/viper_wheel_right.obj +0 -0
  52. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/silo.obj +0 -0
  53. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/sphere.obj +0 -0
  54. {DEME-0.3.3 → DEME-0.3.5}/data/mesh/thin_plate.obj +0 -0
  55. {DEME-0.3.3 → DEME-0.3.5}/data/sim_data/example_cnt_pairs.csv +0 -0
  56. {DEME-0.3.3 → DEME-0.3.5}/pyproject.toml +0 -0
  57. {DEME-0.3.3 → DEME-0.3.5}/setup.cfg +0 -0
  58. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/API.h +0 -0
  59. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/APIPrivate.cpp +0 -0
  60. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/APIPublic.cpp +0 -0
  61. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/AuxClasses.cpp +0 -0
  62. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/AuxClasses.h +0 -0
  63. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/CMakeLists.txt +0 -0
  64. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/Defines.h +0 -0
  65. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/HostSideHelpers.hpp +0 -0
  66. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/MeshUtils.cpp +0 -0
  67. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/Models.h +0 -0
  68. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/VariableTypes.h +0 -0
  69. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/dT.cpp +0 -0
  70. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/dT.h +0 -0
  71. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/kT.cpp +0 -0
  72. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/kT.h +0 -0
  73. {DEME-0.3.3 → DEME-0.3.5}/src/DEM/utils/Samplers.hpp +0 -0
  74. {DEME-0.3.3 → DEME-0.3.5}/src/algorithms/CMakeLists.txt +0 -0
  75. {DEME-0.3.3 → DEME-0.3.5}/src/algorithms/DEMCubBasedSubroutines.h +0 -0
  76. {DEME-0.3.3 → DEME-0.3.5}/src/algorithms/DEMCubContactDetection.cu +0 -0
  77. {DEME-0.3.3 → DEME-0.3.5}/src/algorithms/DEMCubForceCollection.cu +0 -0
  78. {DEME-0.3.3 → DEME-0.3.5}/src/algorithms/DEMCubUtilities.cu +0 -0
  79. {DEME-0.3.3 → DEME-0.3.5}/src/algorithms/DEMCubWrappers.cu +0 -0
  80. {DEME-0.3.3 → DEME-0.3.5}/src/core/ApiVersion.h.in +0 -0
  81. {DEME-0.3.3 → DEME-0.3.5}/src/core/CMakeLists.txt +0 -0
  82. {DEME-0.3.3 → DEME-0.3.5}/src/core/DebugInfo.cpp +0 -0
  83. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/DEMEPaths.cpp +0 -0
  84. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/DEMEPaths.h +0 -0
  85. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/GpuError.h +0 -0
  86. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/GpuManager.cpp +0 -0
  87. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/GpuManager.h +0 -0
  88. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/HeaderGenerator.h +0 -0
  89. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/JitHelper.cpp +0 -0
  90. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/JitHelper.h +0 -0
  91. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/ManagedAllocator.hpp +0 -0
  92. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/ManagedMemory.hpp +0 -0
  93. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/RuntimeData.cpp.in +0 -0
  94. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/RuntimeData.h +0 -0
  95. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/ThreadManager.h +0 -0
  96. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/Timer.hpp +0 -0
  97. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/WavefrontMeshLoader.hpp +0 -0
  98. {DEME-0.3.3 → DEME-0.3.5}/src/core/utils/csv.hpp +0 -0
  99. {DEME-0.3.3 → DEME-0.3.5}/src/demo/CMakeLists.txt +0 -0
  100. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_BallDrop.cpp +0 -0
  101. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Centrifuge.cpp +0 -0
  102. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_ConePenetration.cpp +0 -0
  103. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Electrostatic.cpp +0 -0
  104. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_FlexibleMesh.cpp +0 -0
  105. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_GRCPrep_Part1.cpp +0 -0
  106. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_GRCPrep_Part2.cpp +0 -0
  107. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_GameOfLife.cpp +0 -0
  108. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Indentation.cpp +0 -0
  109. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Mixer.cpp +0 -0
  110. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Plow.cpp +0 -0
  111. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Repose.cpp +0 -0
  112. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_RotatingDrum.cpp +0 -0
  113. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Shake.cpp +0 -0
  114. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_Sieve.cpp +0 -0
  115. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_SingleSphereCollide.cpp +0 -0
  116. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_SolarSystem.cpp +0 -0
  117. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_TestPack.cpp +0 -0
  118. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_WheelDP.cpp +0 -0
  119. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_WheelDPSimplified.cpp +0 -0
  120. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DEMdemo_WheelSlopeSlip.cpp +0 -0
  121. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0000.vtk +0 -0
  122. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0001.vtk +0 -0
  123. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0002.vtk +0 -0
  124. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0003.vtk +0 -0
  125. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0004.vtk +0 -0
  126. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0005.vtk +0 -0
  127. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0006.vtk +0 -0
  128. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0007.vtk +0 -0
  129. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0008.vtk +0 -0
  130. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0009.vtk +0 -0
  131. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0010.vtk +0 -0
  132. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0011.vtk +0 -0
  133. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0012.vtk +0 -0
  134. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0013.vtk +0 -0
  135. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0014.vtk +0 -0
  136. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0015.vtk +0 -0
  137. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0016.vtk +0 -0
  138. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0017.vtk +0 -0
  139. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0018.vtk +0 -0
  140. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0019.vtk +0 -0
  141. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0020.vtk +0 -0
  142. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0021.vtk +0 -0
  143. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_mesh_0022.vtk +0 -0
  144. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0000.csv +0 -0
  145. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0001.csv +0 -0
  146. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0002.csv +0 -0
  147. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0003.csv +0 -0
  148. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0004.csv +0 -0
  149. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0005.csv +0 -0
  150. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0006.csv +0 -0
  151. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0007.csv +0 -0
  152. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0008.csv +0 -0
  153. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0009.csv +0 -0
  154. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0010.csv +0 -0
  155. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0011.csv +0 -0
  156. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0012.csv +0 -0
  157. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0013.csv +0 -0
  158. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0014.csv +0 -0
  159. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0015.csv +0 -0
  160. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0016.csv +0 -0
  161. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0017.csv +0 -0
  162. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0018.csv +0 -0
  163. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0019.csv +0 -0
  164. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0020.csv +0 -0
  165. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0021.csv +0 -0
  166. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_Mixer/DEMdemo_output_0022.csv +0 -0
  167. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0000.vtk +0 -0
  168. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0001.vtk +0 -0
  169. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0002.vtk +0 -0
  170. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0003.vtk +0 -0
  171. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0004.vtk +0 -0
  172. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0005.vtk +0 -0
  173. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0006.vtk +0 -0
  174. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0007.vtk +0 -0
  175. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0008.vtk +0 -0
  176. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0009.vtk +0 -0
  177. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0010.vtk +0 -0
  178. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_mesh_0011.vtk +0 -0
  179. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0000.csv +0 -0
  180. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0001.csv +0 -0
  181. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0002.csv +0 -0
  182. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0003.csv +0 -0
  183. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0004.csv +0 -0
  184. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0005.csv +0 -0
  185. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0006.csv +0 -0
  186. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0007.csv +0 -0
  187. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0008.csv +0 -0
  188. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0009.csv +0 -0
  189. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0010.csv +0 -0
  190. {DEME-0.3.3 → DEME-0.3.5}/src/demo/DemoOutput_WheelDPSimplified/DEMdemo_output_0011.csv +0 -0
  191. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/CUDAMathHelpers.cu +0 -0
  192. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMBinSphereKernels.cu +0 -0
  193. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMBinTriangleKernels.cu +0 -0
  194. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCalcForceKernels.cu +0 -0
  195. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCollectForceKernels.cu +0 -0
  196. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCollectForceKernels_Compact.cu +0 -0
  197. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCollisionKernels.cu +0 -0
  198. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMContactKernels_SphereSphere.cu +0 -0
  199. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMContactKernels_SphereTriangle.cu +0 -0
  200. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/AnalyticalCompDefJitify.cu +0 -0
  201. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/ClumpCompAcqStratAllFlatten.cu +0 -0
  202. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/ClumpCompAcqStratAllJitify.cu +0 -0
  203. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/ClumpCompAcqStratPartialJitify.cu +0 -0
  204. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/ClumpCompDefJitify.cu +0 -0
  205. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/ContactInfoWriteBack.cu +0 -0
  206. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/ForceInKernelReductionStrat.cu +0 -0
  207. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/FrictionlessHertzianForceModel.cu +0 -0
  208. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/FullHertzianForceModel.cu +0 -0
  209. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/IntegrationVelPassOnCenteredDiff.cu +0 -0
  210. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/IntegrationVelPassOnExtendedTaylor.cu +0 -0
  211. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/IntegrationVelPassOnForwardEuler.cu +0 -0
  212. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/MOIAcqStratFlatten.cu +0 -0
  213. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/MOIAcqStratJitify.cu +0 -0
  214. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/MOIDefJitify.cu +0 -0
  215. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/MassAcqStratFlatten.cu +0 -0
  216. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/MassAcqStratJitify.cu +0 -0
  217. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMCustomizablePolicies/MassDefJitify.cu +0 -0
  218. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMHelperKernels.cu +0 -0
  219. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMHistoryMappingKernels.cu +0 -0
  220. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMIntegrationKernels.cu +0 -0
  221. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMMiscKernels.cu +0 -0
  222. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMModeratorKernels.cu +0 -0
  223. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMOwnerQueryKernels.cu +0 -0
  224. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMPrepForceKernels.cu +0 -0
  225. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMSphereQueryKernels.cu +0 -0
  226. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMTriangleBoxIntersect.cu +0 -0
  227. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMUserScripts/ForceModelWithCohesion.cu +0 -0
  228. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMUserScripts/ForceModelWithElectrostatic.cu +0 -0
  229. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/DEMUserScripts/ForceModelWithGravity.cu +0 -0
  230. {DEME-0.3.3 → DEME-0.3.5}/src/kernel/hello.cu +0 -0
  231. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/.clang-format +0 -0
  232. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/.git +0 -0
  233. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/.gitignore +0 -0
  234. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/Doxyfile +0 -0
  235. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/LICENSE +0 -0
  236. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/Makefile +0 -0
  237. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/README.md +0 -0
  238. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/example_headers/class_arg_kernel.cuh +0 -0
  239. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/example_headers/constant_header.cuh +0 -0
  240. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/example_headers/my_header1.cuh +0 -0
  241. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/example_headers/my_header2.cuh +0 -0
  242. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/example_headers/my_header3.cuh +0 -0
  243. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/jitify.hpp +0 -0
  244. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/jitify_example.cpp +0 -0
  245. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/jitify_test.cu +0 -0
  246. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/nvrtc_cli.cpp +0 -0
  247. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/nvrtc_cli_test.sh +0 -0
  248. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/jitify/stringify.cpp +0 -0
  249. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/nvidia_helper_math/nvmath/helper_math.cuh +0 -0
  250. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.appveyor.yml +0 -0
  251. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.clang-format +0 -0
  252. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.clang-tidy +0 -0
  253. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.cmake-format.yaml +0 -0
  254. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.codespell-ignore-lines +0 -0
  255. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.git +0 -0
  256. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.gitattributes +0 -0
  257. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/CODEOWNERS +0 -0
  258. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/CONTRIBUTING.md +0 -0
  259. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/ISSUE_TEMPLATE/bug-report.yml +0 -0
  260. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/ISSUE_TEMPLATE/config.yml +0 -0
  261. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/dependabot.yml +0 -0
  262. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/labeler.yml +0 -0
  263. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/labeler_merged.yml +0 -0
  264. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/matchers/pylint.json +0 -0
  265. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/pull_request_template.md +0 -0
  266. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/workflows/ci.yml +0 -0
  267. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/workflows/configure.yml +0 -0
  268. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/workflows/format.yml +0 -0
  269. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/workflows/labeler.yml +0 -0
  270. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/workflows/pip.yml +0 -0
  271. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.github/workflows/upstream.yml +0 -0
  272. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.gitignore +0 -0
  273. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.pre-commit-config.yaml +0 -0
  274. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/.readthedocs.yml +0 -0
  275. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/CMakeLists.txt +0 -0
  276. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/LICENSE +0 -0
  277. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/MANIFEST.in +0 -0
  278. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/README.rst +0 -0
  279. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/Doxyfile +0 -0
  280. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/Makefile +0 -0
  281. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/_static/css/custom.css +0 -0
  282. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/chrono.rst +0 -0
  283. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/custom.rst +0 -0
  284. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/eigen.rst +0 -0
  285. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/functional.rst +0 -0
  286. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/index.rst +0 -0
  287. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/overview.rst +0 -0
  288. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/stl.rst +0 -0
  289. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/cast/strings.rst +0 -0
  290. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/classes.rst +0 -0
  291. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/embedding.rst +0 -0
  292. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/exceptions.rst +0 -0
  293. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/functions.rst +0 -0
  294. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/misc.rst +0 -0
  295. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/pycpp/index.rst +0 -0
  296. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/pycpp/numpy.rst +0 -0
  297. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/pycpp/object.rst +0 -0
  298. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/pycpp/utilities.rst +0 -0
  299. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/advanced/smart_ptrs.rst +0 -0
  300. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/basics.rst +0 -0
  301. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/benchmark.py +0 -0
  302. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/benchmark.rst +0 -0
  303. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/changelog.rst +0 -0
  304. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/classes.rst +0 -0
  305. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/cmake/index.rst +0 -0
  306. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/compiling.rst +0 -0
  307. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/conf.py +0 -0
  308. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/faq.rst +0 -0
  309. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/index.rst +0 -0
  310. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/installing.rst +0 -0
  311. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/limitations.rst +0 -0
  312. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/pybind11-logo.png +0 -0
  313. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/pybind11_vs_boost_python1.png +0 -0
  314. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/pybind11_vs_boost_python1.svg +0 -0
  315. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/pybind11_vs_boost_python2.png +0 -0
  316. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/pybind11_vs_boost_python2.svg +0 -0
  317. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/reference.rst +0 -0
  318. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/release.rst +0 -0
  319. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/requirements.txt +0 -0
  320. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/docs/upgrade.rst +0 -0
  321. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/attr.h +0 -0
  322. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/buffer_info.h +0 -0
  323. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/cast.h +0 -0
  324. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/chrono.h +0 -0
  325. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/common.h +0 -0
  326. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/complex.h +0 -0
  327. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/class.h +0 -0
  328. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/common.h +0 -0
  329. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/descr.h +0 -0
  330. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/init.h +0 -0
  331. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/internals.h +0 -0
  332. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/type_caster_base.h +0 -0
  333. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/detail/typeid.h +0 -0
  334. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/eigen/matrix.h +0 -0
  335. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/eigen/tensor.h +0 -0
  336. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/eigen.h +0 -0
  337. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/embed.h +0 -0
  338. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/eval.h +0 -0
  339. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/functional.h +0 -0
  340. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/gil.h +0 -0
  341. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/iostream.h +0 -0
  342. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/numpy.h +0 -0
  343. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/operators.h +0 -0
  344. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/options.h +0 -0
  345. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/pybind11.h +0 -0
  346. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/pytypes.h +0 -0
  347. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/stl/filesystem.h +0 -0
  348. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/stl.h +0 -0
  349. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/include/pybind11/stl_bind.h +0 -0
  350. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/noxfile.py +0 -0
  351. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pybind11/__init__.py +0 -0
  352. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pybind11/__main__.py +0 -0
  353. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pybind11/_version.py +0 -0
  354. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pybind11/commands.py +0 -0
  355. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pybind11/py.typed +0 -0
  356. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pybind11/setup_helpers.py +0 -0
  357. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/pyproject.toml +0 -0
  358. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/setup.cfg +0 -0
  359. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/setup.py +0 -0
  360. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/CMakeLists.txt +0 -0
  361. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/conftest.py +0 -0
  362. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/constructor_stats.h +0 -0
  363. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/cross_module_gil_utils.cpp +0 -0
  364. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/cross_module_interleaved_error_already_set.cpp +0 -0
  365. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/eigen_tensor_avoid_stl_array.cpp +0 -0
  366. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/env.py +0 -0
  367. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/extra_python_package/pytest.ini +0 -0
  368. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/extra_python_package/test_files.py +0 -0
  369. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/extra_setuptools/pytest.ini +0 -0
  370. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/extra_setuptools/test_setuphelper.py +0 -0
  371. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/local_bindings.h +0 -0
  372. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/object.h +0 -0
  373. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/pybind11_cross_module_tests.cpp +0 -0
  374. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/pybind11_tests.cpp +0 -0
  375. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/pybind11_tests.h +0 -0
  376. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/pytest.ini +0 -0
  377. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/requirements.txt +0 -0
  378. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_async.cpp +0 -0
  379. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_async.py +0 -0
  380. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_buffers.cpp +0 -0
  381. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_buffers.py +0 -0
  382. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_builtin_casters.cpp +0 -0
  383. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_builtin_casters.py +0 -0
  384. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_call_policies.cpp +0 -0
  385. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_call_policies.py +0 -0
  386. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_callbacks.cpp +0 -0
  387. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_callbacks.py +0 -0
  388. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_chrono.cpp +0 -0
  389. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_chrono.py +0 -0
  390. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_class.cpp +0 -0
  391. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_class.py +0 -0
  392. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/CMakeLists.txt +0 -0
  393. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/embed.cpp +0 -0
  394. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt +0 -0
  395. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt +0 -0
  396. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt +0 -0
  397. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/main.cpp +0 -0
  398. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt +0 -0
  399. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt +0 -0
  400. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt +0 -0
  401. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_cmake_build/test.py +0 -0
  402. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_const_name.cpp +0 -0
  403. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_const_name.py +0 -0
  404. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_constants_and_functions.cpp +0 -0
  405. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_constants_and_functions.py +0 -0
  406. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_copy_move.cpp +0 -0
  407. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_copy_move.py +0 -0
  408. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_custom_type_casters.cpp +0 -0
  409. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_custom_type_casters.py +0 -0
  410. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_custom_type_setup.cpp +0 -0
  411. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_custom_type_setup.py +0 -0
  412. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_docstring_options.cpp +0 -0
  413. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_docstring_options.py +0 -0
  414. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eigen_matrix.cpp +0 -0
  415. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eigen_matrix.py +0 -0
  416. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eigen_tensor.cpp +0 -0
  417. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eigen_tensor.inl +0 -0
  418. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eigen_tensor.py +0 -0
  419. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_embed/CMakeLists.txt +0 -0
  420. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_embed/catch.cpp +0 -0
  421. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_embed/external_module.cpp +0 -0
  422. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_embed/test_interpreter.cpp +0 -0
  423. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_embed/test_interpreter.py +0 -0
  424. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_embed/test_trampoline.py +0 -0
  425. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_enum.cpp +0 -0
  426. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_enum.py +0 -0
  427. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eval.cpp +0 -0
  428. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eval.py +0 -0
  429. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_eval_call.py +0 -0
  430. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_exceptions.cpp +0 -0
  431. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_exceptions.h +0 -0
  432. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_exceptions.py +0 -0
  433. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_factory_constructors.cpp +0 -0
  434. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_factory_constructors.py +0 -0
  435. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_gil_scoped.cpp +0 -0
  436. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_gil_scoped.py +0 -0
  437. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_iostream.cpp +0 -0
  438. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_iostream.py +0 -0
  439. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_kwargs_and_defaults.cpp +0 -0
  440. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_kwargs_and_defaults.py +0 -0
  441. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_local_bindings.cpp +0 -0
  442. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_local_bindings.py +0 -0
  443. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_methods_and_attributes.cpp +0 -0
  444. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_methods_and_attributes.py +0 -0
  445. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_modules.cpp +0 -0
  446. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_modules.py +0 -0
  447. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_multiple_inheritance.cpp +0 -0
  448. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_multiple_inheritance.py +0 -0
  449. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_numpy_array.cpp +0 -0
  450. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_numpy_array.py +0 -0
  451. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_numpy_dtypes.cpp +0 -0
  452. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_numpy_dtypes.py +0 -0
  453. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_numpy_vectorize.cpp +0 -0
  454. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_numpy_vectorize.py +0 -0
  455. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_opaque_types.cpp +0 -0
  456. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_opaque_types.py +0 -0
  457. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_operator_overloading.cpp +0 -0
  458. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_operator_overloading.py +0 -0
  459. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_pickling.cpp +0 -0
  460. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_pickling.py +0 -0
  461. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_pytypes.cpp +0 -0
  462. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_pytypes.py +0 -0
  463. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_sequences_and_iterators.cpp +0 -0
  464. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_sequences_and_iterators.py +0 -0
  465. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_smart_ptr.cpp +0 -0
  466. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_smart_ptr.py +0 -0
  467. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_stl.cpp +0 -0
  468. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_stl.py +0 -0
  469. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_stl_binders.cpp +0 -0
  470. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_stl_binders.py +0 -0
  471. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_tagbased_polymorphic.cpp +0 -0
  472. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_tagbased_polymorphic.py +0 -0
  473. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_thread.cpp +0 -0
  474. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_thread.py +0 -0
  475. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_union.cpp +0 -0
  476. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_union.py +0 -0
  477. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_virtual_functions.cpp +0 -0
  478. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/test_virtual_functions.py +0 -0
  479. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/valgrind-numpy-scipy.supp +0 -0
  480. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tests/valgrind-python.supp +0 -0
  481. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/FindCatch.cmake +0 -0
  482. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/FindEigen3.cmake +0 -0
  483. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/FindPythonLibsNew.cmake +0 -0
  484. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/JoinPaths.cmake +0 -0
  485. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/check-style.sh +0 -0
  486. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/cmake_uninstall.cmake.in +0 -0
  487. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/codespell_ignore_lines_from_errors.py +0 -0
  488. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/libsize.py +0 -0
  489. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/make_changelog.py +0 -0
  490. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/pybind11.pc.in +0 -0
  491. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/pybind11Common.cmake +0 -0
  492. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/pybind11Config.cmake.in +0 -0
  493. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/pybind11NewTools.cmake +0 -0
  494. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/pybind11Tools.cmake +0 -0
  495. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/pyproject.toml +0 -0
  496. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/setup_global.py.in +0 -0
  497. {DEME-0.3.3 → DEME-0.3.5}/thirdparty/pybind11/tools/setup_main.py.in +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: DEME
3
- Version: 0.3.3
3
+ Version: 0.3.5
4
4
  Summary: PyBind Wrapper Library for DEM-Engine
5
5
  Home-page: UNKNOWN
6
6
  Author: Rouchun Zhang
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: DEME
3
- Version: 0.3.3
3
+ Version: 0.3.5
4
4
  Summary: PyBind Wrapper Library for DEM-Engine
5
5
  Home-page: UNKNOWN
6
6
  Author: Rouchun Zhang
@@ -51,6 +51,8 @@ You are welcome to discuss _DEME_ on [Project Chrono's forum](https://groups.goo
51
51
 
52
52
  <h2 id="pyDEME">PyDEME</h2>
53
53
 
54
+ #### _pyDEME_ is BEING TESTED, many methods are not yet wrapped and the scripts may not work yet. For now it is recommended to <a href="#installation">install _DEME_ from source</a>.
55
+
54
56
  _DEME_ is now available as a Python package, _pyDEME_.
55
57
 
56
58
  To install _pyDEME_, use a Linux machine, install CUDA if you do not already have it. Useful installation instructions may be found [here](https://developer.nvidia.com/cuda-downloads).
@@ -60,14 +62,19 @@ Some additional troubleshooting tips for getting CUDA ready:
60
62
  - I recommend just getting CUDA 12.0, or a CUDA 11 distro. CUDA 12.1 and 12.2 appears to cause troubles with jitify.
61
63
  - On WSL this code may be buildable (and [this](https://docs.nvidia.com/cuda/wsl-user-guide/index.html) is the guide for installing CUDA on WSL), but may not run. This is due to the [many limitations on unified memory and pinned memory support](https://docs.nvidia.com/cuda/wsl-user-guide/index.html#known-limitations-for-linux-cuda-applications) on WSL. A native Linux machine or cluster is recommended.
62
64
 
63
- Once CUDA is ready, you can install _pyDEME_ via `pip`:
64
-
65
+ Once CUDA is ready, you can `pip` install _pyDEME_. In your conda environement, do
65
66
  ```
66
67
  conda create -n pyDEME python=3.11
67
68
  conda activate pyDEME
68
69
  conda install cmake
69
70
  pip3 install DEME
70
71
  ```
72
+ ~~You can also install pyDEME via `conda install`:~~ (Please don't use `conda install` for now, it is not yet behaving correctly)
73
+ ```
74
+ conda create -n pyDEME python=3.11
75
+ conda activate pyDEME
76
+ conda install -c projectchrono pydeme
77
+ ```
71
78
  `pyDEME` can be replaced with an environement name of your choice. Other Python versions other than 3.11 should work as well.
72
79
 
73
80
  Then [Python scripts](https://github.com/projectchrono/DEM-Engine/tree/pyDEME_demo/src/demo) can be executed in this environment. To understand the content of each Python demo, refer to the explanations of the C++ demos with the same names in **Examples** section.
@@ -7,7 +7,7 @@ To perform a pip distribution, follow the steps listed below:
7
7
  3. Make sure you conda install cmake.
8
8
  4. Run the following command in the DEM-Engine directory: python -m build .
9
9
  5. Download Twine in order to upload packages to pyPi: python3 -m pip install --upgrade twine
10
- 6. Upload the built package from the following command: python3 -m twine upload --repository pypi dist/DEME-<VERSION>.tar.bz2
10
+ 6. Upload the built package from the following command: python3 -m twine upload --repository pypi dist/DEME-<VERSION>.tar.gz
11
11
 
12
12
  NOTE: You will be prompted for a username after step 5. Enter '__token__' as the username, and enter your PyPi token obtained
13
13
  from the UW-SBEL pypi.org account.
@@ -148,7 +148,7 @@ class CMakeBuild(build_ext):
148
148
  # logic and declaration, and simpler if you include description/version in a file.
149
149
  setup(
150
150
  name="DEME",
151
- version="0.3.3",
151
+ version="0.3.5",
152
152
  author="Rouchun Zhang",
153
153
  author_email="rzhang294@wisc.edu",
154
154
  description="PyBind Wrapper Library for DEM-Engine",
@@ -95,6 +95,12 @@ class DEMExternObj : public DEMInitializer {
95
95
  // Obj's MOI (huge by default)
96
96
  float3 MOI = make_float3(1e6);
97
97
 
98
+ float GetMass() { return mass; }
99
+ std::vector<float> GetMOI() {
100
+ std::vector<float> res = {MOI.x, MOI.y, MOI.z};
101
+ return res;
102
+ }
103
+
98
104
  union DEMAnalEntParams {
99
105
  DEMPlateParams_t plate;
100
106
  DEMPlaneParams_t plane;
@@ -384,6 +390,12 @@ class DEMMeshConnected : public DEMInitializer {
384
390
  // Mesh's MOI
385
391
  float3 MOI = make_float3(1.f);
386
392
 
393
+ float GetMass() { return mass; }
394
+ std::vector<float> GetMOI() {
395
+ std::vector<float> res = {MOI.x, MOI.y, MOI.z};
396
+ return res;
397
+ }
398
+
387
399
  std::string filename; ///< file string if loading an obj file
388
400
 
389
401
  // If true, when the mesh is initialized into the system, it will re-order the nodes of each triangle so that the
@@ -557,7 +569,7 @@ class DEMMeshConnected : public DEMInitializer {
557
569
  // Never let mass become negative.
558
570
  double prod = std::abs((double)s.x * (double)s.y * (double)s.z);
559
571
  mass *= prod;
560
- MOI.x *= prod * s.x * s.x; // Square, so always positive
572
+ MOI.x *= prod * s.x * s.x; // Square, so always positive
561
573
  MOI.y *= prod * s.y * s.y;
562
574
  MOI.z *= prod * s.z * s.z;
563
575
  }
@@ -41,6 +41,12 @@ PYBIND11_MODULE(DEME, obj) {
41
41
  deme::SetDEMEKernelPath(path / "share/kernel");
42
42
  deme::SetDEMEIncludePath(path / "include");
43
43
 
44
+ // To define methods independent of a class, use obj.def() syntax to wrap them!
45
+ obj.def("FrameTransformGlobalToLocal", &deme::FrameTransformGlobalToLocal,
46
+ "Translating the inverse of the provided vec then applying a local inverse rotation of the provided rot_Q, "
47
+ "then return the result.");
48
+ obj.def("FrameTransformLocalToGlobal", &deme::FrameTransformLocalToGlobal,
49
+ "Apply a local rotation then a translation, then return the result.");
44
50
  obj.def("GetDEMEDataFile", &deme::GetDEMEDataFile);
45
51
  obj.def("DEMBoxGridSampler",
46
52
  static_cast<std::vector<std::vector<float>> (*)(const std::vector<float>&, const std::vector<float>&, float,
@@ -487,7 +493,8 @@ PYBIND11_MODULE(DEME, obj) {
487
493
  &deme::DEMSolver::SetFamilyPrescribedAngVel),
488
494
  "Set the prescribed angular velocity to all entities in a family. If dictate is set to true, then this "
489
495
  "family will not be fluenced by the force exerted from other simulation entites (both linear and "
490
- "rotational motions).")
496
+ "rotational motions).",
497
+ py::arg("ID"), py::arg("velX"), py::arg("velY"), py::arg("velZ"), py::arg("dictate") = true)
491
498
  .def("SetFamilyPrescribedAngVel",
492
499
  static_cast<void (deme::DEMSolver::*)(unsigned int ID)>(&deme::DEMSolver::SetFamilyPrescribedAngVel),
493
500
  "Set the prescribed angular velocity to all entities in a family. If dictate is set to true, then this "
@@ -634,6 +641,8 @@ PYBIND11_MODULE(DEME, obj) {
634
641
 
635
642
  py::class_<deme::DEMClumpTemplate, std::shared_ptr<deme::DEMClumpTemplate>>(obj, "DEMClumpTemplate")
636
643
  .def(py::init<>())
644
+ .def("Mass", &deme::DEMClumpTemplate::GetMass)
645
+ .def("MOI", &deme::DEMClumpTemplate::GetMOI)
637
646
  .def("SetMass", &deme::DEMClumpTemplate::SetMass)
638
647
  .def("SetMOI",
639
648
  static_cast<void (deme::DEMClumpTemplate::*)(const std::vector<float>&)>(&deme::DEMClumpTemplate::SetMOI))
@@ -696,6 +705,8 @@ PYBIND11_MODULE(DEME, obj) {
696
705
 
697
706
  py::class_<deme::DEMExternObj, deme::DEMInitializer, std::shared_ptr<deme::DEMExternObj>>(obj, "DEMExternObj")
698
707
  .def(py::init<>())
708
+ .def("Mass", &deme::DEMExternObj::GetMass)
709
+ .def("MOI", &deme::DEMExternObj::GetMOI)
699
710
  .def("SetFamily", &deme::DEMExternObj::SetFamily, "Defines an object contact family number")
700
711
  .def("SetMass", &deme::DEMExternObj::SetMass, "Sets the mass of this object")
701
712
  .def("SetMOI",
@@ -740,6 +751,8 @@ PYBIND11_MODULE(DEME, obj) {
740
751
  .def(py::init<>())
741
752
  .def(py::init<std::string&>())
742
753
  .def(py::init<std::string, const std::shared_ptr<deme::DEMMaterial>&>())
754
+ .def("Mass", &deme::DEMMeshConnected::GetMass)
755
+ .def("MOI", &deme::DEMMeshConnected::GetMOI)
743
756
  .def("Clear", &deme::DEMMeshConnected::Clear, "Clears everything from memory")
744
757
  .def("LoadWavefrontMesh", &deme::DEMMeshConnected::LoadWavefrontMesh,
745
758
  "Load a triangle mesh saved as a Wavefront .obj file", py::arg("input_file"),
@@ -609,6 +609,12 @@ class DEMClumpTemplate {
609
609
  std::vector<std::shared_ptr<DEMMaterial>> materials;
610
610
  unsigned int nComp = 0; // Number of components
611
611
 
612
+ float GetMass() { return mass; }
613
+ std::vector<float> GetMOI() {
614
+ std::vector<float> res = {MOI.x, MOI.y, MOI.z};
615
+ return res;
616
+ }
617
+
612
618
  /// Set mass.
613
619
  void SetMass(float mass) { this->mass = mass; }
614
620
  /// Set MOI (in principal frame).
@@ -63,7 +63,7 @@ if __name__ == "__main__":
63
63
  sample_halfheight = world_size / 8
64
64
  sample_center = [world_size / 2, world_size / 2, sample_halfheight + 0.05]
65
65
  sample_halfwidth = world_size / 2 * 0.95
66
-
66
+
67
67
  input_xyz = DEME.DEMBoxHCPSampler(sample_center, [
68
68
  sample_halfwidth, sample_halfwidth, sample_halfheight], 2.01 * terrain_rad)
69
69
  DEMSim.AddClumps(template_terrain, input_xyz)
@@ -94,7 +94,7 @@ if __name__ == "__main__":
94
94
  # We can let it settle first
95
95
  t = 0.
96
96
  while (t < settle_time):
97
- print(f"Frame: {currframe}")
97
+ print(f"Frame: {currframe}", flush=True)
98
98
  filename = os.path.join(out_dir, f"DEMdemo_output_{currframe:04d}.csv")
99
99
  meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
100
100
  DEMSim.WriteSphereFile(filename)
@@ -112,7 +112,7 @@ if __name__ == "__main__":
112
112
 
113
113
  t = 0.
114
114
  while (t < sim_time):
115
- print(f"Frame: {currframe}")
115
+ print(f"Frame: {currframe}", flush=True)
116
116
  filename = os.path.join(out_dir, f"DEMdemo_output_{currframe:04d}.csv")
117
117
  meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
118
118
  DEMSim.WriteSphereFile(filename)
@@ -92,7 +92,7 @@ if __name__ == "__main__":
92
92
  drum_family = 100
93
93
  Drum.SetFamily(drum_family)
94
94
  # The drum rotates (facing Z direction)
95
- DEMSim.SetFamilyPrescribedAngVel(drum_family, "0", "0", "6.0", False)
95
+ DEMSim.SetFamilyPrescribedAngVel(drum_family, "0", "0", "6.0")
96
96
  # Then add planes to `close up' the drum. We add it as another object b/c we want to track the force on it
97
97
  # separately.
98
98
  top_bot_planes = DEMSim.AddExternalObject()
@@ -149,7 +149,7 @@ if __name__ == "__main__":
149
149
  t = 0.
150
150
  while (t < time_end):
151
151
  if (curr_step % out_steps == 0):
152
- print(f"Frame: {currframe}")
152
+ print(f"Frame: {currframe}", flush=True)
153
153
  filename = os.path.join(
154
154
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
155
155
  DEMSim.WriteSphereFile(filename)
@@ -157,19 +157,21 @@ if __name__ == "__main__":
157
157
 
158
158
  DEMSim.ShowThreadCollaborationStats()
159
159
  max_v = max_v_finder.GetValue()
160
- print(f"Max velocity of any point in simulation is {max_v}")
160
+ print(
161
+ f"Max velocity of any point in simulation is {max_v}", flush=True)
161
162
 
162
163
  # Torque on the side walls are?
163
164
  drum_moi = np.array(Drum_tracker.MOI())
164
165
  drum_pos = np.array(Drum_tracker.ContactAngAccLocal())
165
166
  drum_torque = np.multiply(drum_pos, drum_moi)
166
167
  print(
167
- f"Contact torque on the side walls is {drum_torque[0]}, {drum_torque[1]}, {drum_torque[2]}")
168
+ f"Contact torque on the side walls is {drum_torque[0]}, {drum_torque[1]}, {drum_torque[2]}", flush=True)
168
169
 
169
170
  # The force on the bottom plane?
170
171
  force_on_BC = np.array(
171
172
  planes_tracker.ContactAcc()) * planes_tracker.Mass()
172
- print(f"Contact force on bottom plane is {force_on_BC[2]}")
173
+ print(
174
+ f"Contact force on bottom plane is {force_on_BC[2]}", flush=True)
173
175
 
174
176
  DEMSim.DoDynamics(step_size)
175
177
  t += step_size
@@ -161,14 +161,14 @@ if __name__ == "__main__":
161
161
  (soil_bin_diameter * soil_bin_diameter / 4) * (terrain_max_z - bottom)
162
162
  bulk_density = matter_mass / total_volume
163
163
  if (curr_step % out_steps == 0):
164
- print(f"Outputting frame: {currframe}")
164
+ print(f"Outputting frame: {currframe}", flush=True)
165
165
  filename = os.path.join(
166
166
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
167
167
  # meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
168
168
  DEMSim.WriteSphereFile(filename)
169
169
  # DEMSim.WriteMeshFile(meshname)
170
170
  currframe += 1
171
- print(f"Compression bulk density: {bulk_density}")
171
+ print(f"Compression bulk density: {bulk_density}", flush=True)
172
172
 
173
173
  terrain_max_z -= compressor_vel * step_size
174
174
  compressor_tracker.SetPos([0, 0, terrain_max_z])
@@ -178,7 +178,7 @@ if __name__ == "__main__":
178
178
  # Then gradually remove the compressor
179
179
  while (terrain_max_z < init_max_z):
180
180
  if (curr_step % out_steps == 0):
181
- print(f"Outputting frame: {currframe}")
181
+ print(f"Outputting frame: {currframe}", flush=True)
182
182
  filename = os.path.join(
183
183
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
184
184
  # meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
@@ -189,7 +189,7 @@ if __name__ == "__main__":
189
189
  (soil_bin_diameter * soil_bin_diameter / 4) * \
190
190
  (max_z_finder.GetValue() - bottom)
191
191
  bulk_density = matter_mass / total_volume
192
- print(f"Compression bulk density: {bulk_density}")
192
+ print(f"Compression bulk density: {bulk_density}", flush=True)
193
193
  currframe += 1
194
194
 
195
195
  terrain_max_z += compressor_vel * step_size
@@ -224,7 +224,7 @@ if __name__ == "__main__":
224
224
  total_volume = math_PI * (soil_bin_diameter *
225
225
  soil_bin_diameter / 4) * (terrain_max_z - bottom)
226
226
  bulk_density = matter_mass / total_volume
227
- print(f"Bulk density: {bulk_density}")
227
+ print(f"Bulk density: {bulk_density}", flush=True)
228
228
 
229
229
  tip_z_when_first_hit = 9999.
230
230
  hit_terrain = False
@@ -235,7 +235,7 @@ if __name__ == "__main__":
235
235
  # terrain_max_z = max_z_finder.GetValue()
236
236
  forces = tip_tracker.ContactAcc()
237
237
  # Note cone_mass is not the true mass, b/c we scaled the the cone tip! So we use true mass by using cone_mass
238
- forces = np.array(forces) * cone_mass
238
+ forces = np.array(forces) * cone_tip.Mass()
239
239
  # forces[2] is the z dir force
240
240
  pressure = np.abs(forces[2]) / cone_surf_area
241
241
  if ((pressure > 1e-4) and not (hit_terrain)):
@@ -243,14 +243,15 @@ if __name__ == "__main__":
243
243
  tip_z_when_first_hit = tip_z
244
244
 
245
245
  penetration = tip_z_when_first_hit - tip_z if hit_terrain else 0.
246
- print(f"Time: {t}")
247
- print(f"Z coord of tip: {tip_z}")
248
- print(f"Penetration: {penetration}")
249
- print(f"Force on cone: {forces[0]}, {forces[1]}, {forces[2]}")
250
- print(f"Pressure: {pressure}")
246
+ print(f"Time: {t}", flush=True)
247
+ print(f"Z coord of tip: {tip_z}", flush=True)
248
+ print(f"Penetration: {penetration}", flush=True)
249
+ print(
250
+ f"Force on cone: {forces[0]}, {forces[1]}, {forces[2]}", flush=True)
251
+ print(f"Pressure: {pressure}", flush=True)
251
252
 
252
253
  if (frame_count % 500 == 0):
253
- print(f"Outputting frame: {currframe}")
254
+ print(f"Outputting frame: {currframe}", flush=True)
254
255
  filename = os.path.join(
255
256
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
256
257
  meshname = os.path.join(
@@ -341,7 +341,7 @@ if __name__ == "__main__":
341
341
 
342
342
  t = 0.
343
343
  while (t < 1.):
344
- print(f"Outputting frame: {currframe}")
344
+ print(f"Outputting frame: {currframe}", flush=True)
345
345
  filename = os.path.join(out_dir, f"DEMdemo_output_{currframe:04d}.csv")
346
346
  meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
347
347
  DEMSim.WriteSphereFile(filename)
@@ -368,7 +368,7 @@ if __name__ == "__main__":
368
368
  t = 0.
369
369
  while (t < sim_end):
370
370
  if (step_count % out_steps == 0):
371
- print(f"Outputting frame: {currframe}")
371
+ print(f"Outputting frame: {currframe}", flush=True)
372
372
  filename = os.path.join(
373
373
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
374
374
  meshname = os.path.join(
@@ -169,7 +169,7 @@ if __name__ == "__main__":
169
169
  # Settle
170
170
  t = 0.
171
171
  while (t < 0.5):
172
- print(f"Outputting frame: {frame_count}")
172
+ print(f"Outputting frame: {frame_count}", flush=True)
173
173
  filename = os.path.join(
174
174
  out_dir, f"DEMdemo_output_{frame_count:04d}.csv")
175
175
  meshname = os.path.join(
@@ -198,7 +198,7 @@ if __name__ == "__main__":
198
198
  t = 0.
199
199
  while (t < sim_end):
200
200
  if (step_count % out_steps == 0):
201
- print(f"Outputting frame: {frame_count}")
201
+ print(f"Outputting frame: {frame_count}", flush=True)
202
202
  filename = os.path.join(
203
203
  out_dir, f"DEMdemo_output_{frame_count:04d}.csv")
204
204
  meshname = os.path.join(
@@ -209,7 +209,7 @@ if __name__ == "__main__":
209
209
  DEMSim.WriteMeshFile(meshname)
210
210
  frame_count += 1
211
211
  # We write force pairs that are related to the mesh to a file
212
- points, forces = flex_mesh_tracker.GetContactForces()
212
+ [points, forces] = flex_mesh_tracker.GetContactForces()
213
213
  writePointsForcesToCSV(
214
214
  force_csv_header, points, forces, force_filename)
215
215
  DEMSim.ShowThreadCollaborationStats()
@@ -226,7 +226,7 @@ if __name__ == "__main__":
226
226
  flex_mesh_tracker.GetMeshNodesGlobal())
227
227
  # If you need the current RELATIVE (to the CoM) locations of the mesh nodes instead of global coordinates,
228
228
  # you can get it like the following:
229
- # std::vector<float3> node_current_location(mesh_handle->GetCoordsVertices());
229
+ # node_current_location = mesh_handle.GetCoordsVertices()
230
230
 
231
231
  # Now calculate how much each node should `wave' and update the node location array. Remember z = 1 is
232
232
  # where the highest (relative) mesh node is. Again, this is artificial and only for showcasing this
@@ -243,11 +243,11 @@ if __name__ == "__main__":
243
243
 
244
244
  # 1. We should respect the actual CoM location of the mesh. We get the global coords of mesh nodes using
245
245
  # GetMeshNodesGlobal, but UpdateMesh works with mesh's local or say relative coordinates, and that is why
246
- # we do applyFrameTransformGlobalToLocal first. And depending on your setup, the CoM and coord frame of
246
+ # we do FrameTransformGlobalToLocal first. And depending on your setup, the CoM and coord frame of
247
247
  # your mesh might be moving, and if it moves and rotates then you probably need to move and rotate the
248
248
  # points you got to offset the influence of CoM and local frame first. That said, if you use
249
- # mesh_handle->GetCoordsVertices() as I mentioned above to get the relative node positions of the mesh,
250
- # then no need to applyFrameTransformGlobalToLocal the CoM and rotate the frame.
249
+ # mesh_handle.GetCoordsVertices() as I mentioned above to get the relative node positions of the mesh,
250
+ # then no need to FrameTransformGlobalToLocal the CoM and rotate the frame.
251
251
 
252
252
  # 2. UpdateMesh will update the relative locations of mesh nodes to your specified locations. But if you
253
253
  # just have the information on the amount of mesh deformation, then you can use UpdateMeshByIncrement
@@ -255,16 +255,15 @@ if __name__ == "__main__":
255
255
 
256
256
  mesh_CoM_pos = flex_mesh_tracker.Pos()
257
257
  mesh_frame_oriQ = flex_mesh_tracker.OriQ()
258
- for node in node_current_location:
259
- node = DEME.FrameTransformGlobalToLocal(
260
- node, mesh_CoM_pos, mesh_frame_oriQ)
258
+ for i in range(node_current_location.shape[0]):
259
+ node_current_location[i, :] = DEME.FrameTransformGlobalToLocal(
260
+ node_current_location[i, :], mesh_CoM_pos, mesh_frame_oriQ)
261
261
  flex_mesh_tracker.UpdateMesh(node_current_location)
262
262
 
263
263
  # Forces need to be extracted, if you want to use an external solver to solve the mesh's deformation. You
264
264
  # can do it like shown below. In this example, we did not use it other than writing it to a file; however
265
265
  # you may want to feed the array directly to your soild mechanics solver.
266
- num_force_pairs = flex_mesh_tracker.GetContactForces(
267
- points, forces)
266
+ [points, forces] = flex_mesh_tracker.GetContactForces()
268
267
 
269
268
  # Means advance simulation by one time step
270
269
  DEMSim.DoStepDynamics()
@@ -25,7 +25,8 @@ if __name__ == "__main__":
25
25
  DEMSim = DEME.DEMSolver()
26
26
  DEMSim.SetVerbosity("INFO")
27
27
  DEMSim.SetOutputFormat("CSV")
28
- DEMSim.SetOutputContent(["XYZ"]) # XYZ is default so this doesn't do anything
28
+ # XYZ is default so this doesn't do anything
29
+ DEMSim.SetOutputContent(["XYZ"])
29
30
 
30
31
  # Define materials
31
32
  mat_type_terrain = DEMSim.LoadMaterial(
@@ -138,7 +139,7 @@ if __name__ == "__main__":
138
139
  # point of time.
139
140
  t = 0.
140
141
  while (t < settle_batch_time):
141
- print(f"Frame: {currframe}")
142
+ print(f"Frame: {currframe}", flush=True)
142
143
  filename = os.path.join(
143
144
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
144
145
  # meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
@@ -115,11 +115,11 @@ if __name__ == "__main__":
115
115
  DEMSim.Initialize()
116
116
 
117
117
  for i in range(3000):
118
- print(f"Outputting frame: {i}")
118
+ print(f"Outputting frame: {i}", flush=True)
119
119
  filename = os.path.join(out_dir, f"DEMdemo_output_{i:04d}.csv")
120
120
  DEMSim.WriteSphereFile(filename)
121
121
  print(
122
- f"Average contacts each sphere has: {DEMSim.GetAvgSphContacts()}")
122
+ f"Average contacts each sphere has: {DEMSim.GetAvgSphContacts()}", flush=True)
123
123
 
124
124
  DEMSim.DoDynamicsThenSync(1.)
125
125
 
@@ -116,7 +116,7 @@ if __name__ == "__main__":
116
116
  t = 0.
117
117
  start = time.process_time()
118
118
  while (t < sim_end):
119
- print(f"Frame: {currframe}")
119
+ print(f"Frame: {currframe}", flush=True)
120
120
  filename = os.path.join(out_dir, f"DEMdemo_output_{currframe:04d}.csv")
121
121
  meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
122
122
  DEMSim.WriteSphereFile(filename)
@@ -124,17 +124,18 @@ if __name__ == "__main__":
124
124
  currframe += 1
125
125
 
126
126
  max_v = max_v_finder.GetValue()
127
- print(f"Max velocity of any point in simulation is {max_v}")
128
127
  print(
129
- f"Solver's current update frequency (auto-adapted): {DEMSim.GetUpdateFreq()}")
128
+ f"Max velocity of any point in simulation is {max_v}", flush=True)
130
129
  print(
131
- f"Average contacts each sphere has: {DEMSim.GetAvgSphContacts()}")
130
+ f"Solver's current update frequency (auto-adapted): {DEMSim.GetUpdateFreq()}", flush=True)
131
+ print(
132
+ f"Average contacts each sphere has: {DEMSim.GetAvgSphContacts()}", flush=True)
132
133
 
133
134
  mixer_moi = np.array(mixer_tracker.MOI())
134
135
  mixer_acc = np.array(mixer_tracker.ContactAngAccLocal())
135
136
  mixer_torque = np.cross(mixer_acc, mixer_moi)
136
137
  print(
137
- f"Contact torque on the mixer is {mixer_torque[0]}, {mixer_torque[1]}, {mixer_torque[2]}")
138
+ f"Contact torque on the mixer is {mixer_torque[0]}, {mixer_torque[1]}, {mixer_torque[2]}", flush=True)
138
139
 
139
140
  DEMSim.DoDynamics(frame_time)
140
141
  DEMSim.ShowThreadCollaborationStats()
@@ -177,7 +177,7 @@ if __name__ == "__main__":
177
177
 
178
178
  t = 0.
179
179
  while t < 1.:
180
- print(f"Outputting frame: {currframe}")
180
+ print(f"Outputting frame: {currframe}", flush=True)
181
181
  filename = os.path.join(out_dir, f"DEMdemo_output_{currframe:04d}.csv")
182
182
  meshname = os.path.join(out_dir, f"DEMdemo_mesh_{currframe:04d}.vtk")
183
183
  DEMSim.WriteSphereFile(filename)
@@ -194,7 +194,7 @@ if __name__ == "__main__":
194
194
  t = 0.
195
195
  while (t < sim_end):
196
196
  if (curr_step % out_steps == 0):
197
- print(f"Outputting frame: {currframe}")
197
+ print(f"Outputting frame: {currframe}", flush=True)
198
198
  filename = os.path.join(
199
199
  out_dir, f"DEMdemo_output_{currframe:04d}.csv")
200
200
  meshname = os.path.join(
@@ -207,9 +207,11 @@ if __name__ == "__main__":
207
207
  if (curr_step % report_steps == 0):
208
208
  force_list = wheel_tracker.ContactAcc()
209
209
  forces = np.array(force_list) * wheel_mass
210
- print(f"Time: {t}")
211
- print(f"Force on wheel: {forces[0]}, {forces[1]}, {forces[2]}")
212
- print(f"Drawbar pull coeff: {(forces[0] / total_pressure)}")
210
+ print(f"Time: {t}", flush=True)
211
+ print(
212
+ f"Force on wheel: {forces[0]}, {forces[1]}, {forces[2]}", flush=True)
213
+ print(
214
+ f"Drawbar pull coeff: {(forces[0] / total_pressure)}", flush=True)
213
215
 
214
216
  DEMSim.DoDynamics(step_size)
215
217
  curr_step += 1
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes