Skip to content
Snippets Groups Projects
Select Git revision
  • dev-arbd2
  • main default protected
  • arbd2/feat/pybind
  • ext_FT_rbtype
  • rigidbody
  • may24-beta
6 results
Blame Permalink
  • cmaffeo2's avatar
    f3f488cd
    Merge branch 'optimize-grid-particle' into exp_config · f3f488cd
    cmaffeo2 authored 
    Conflicts:
	src/ComputeForce.cu
	src/ComputeGridGrid.cu
	src/ComputeGridGrid.cuh
	src/GrandBrownTown.cu
	src/Makefile
	src/RigidBody.cu
	src/RigidBody.h
	src/RigidBodyController.cu
	src/RigidBodyController.h
	tests/argon-small/BrownDyn.bd
	tests/argon/BrownDyn.bd
    f3f488cd
    History
    Merge branch 'optimize-grid-particle' into exp_config
    cmaffeo2 authored 
    Conflicts:
	src/ComputeForce.cu
	src/ComputeGridGrid.cu
	src/ComputeGridGrid.cuh
	src/GrandBrownTown.cu
	src/Makefile
	src/RigidBody.cu
	src/RigidBody.h
	src/RigidBodyController.cu
	src/RigidBodyController.h
	tests/argon-small/BrownDyn.bd
	tests/argon/BrownDyn.bd