Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nathan's pull request #18

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open

Nathan's pull request #18

wants to merge 69 commits into from

Commits on Oct 19, 2013

  1. Now we have simple force calculation working.

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    ba1310f View commit details
    Browse the repository at this point in the history

  2. Got the basic height field working.

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    8e8b438 View commit details
    Browse the repository at this point in the history

  3. Well, now we no longer hit any debug asserts.

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    b38c305 View commit details
    Browse the repository at this point in the history

  4. Now we have the naive force calculation working.

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    aac4c75 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master'

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    1563889 View commit details
    Browse the repository at this point in the history

  6. Now we can draw the planets as squares. Yay!

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    0cb976d View commit details
    Browse the repository at this point in the history

  7. Now we have our nice spacetime shader. Time to move onto using shared 

    memory.
    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    3ab774e View commit details
    Browse the repository at this point in the history

  8. Performance comparison done on naiveAcc. Time to implement sharedAcc.

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    0657af0 View commit details
    Browse the repository at this point in the history

  9. Code is down for shared memory, and it compiles. Next step is to see … 

    …if it

works.
    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    753c509 View commit details
    Browse the repository at this point in the history

  10. Working with shared memory!

    nmarshak1337 committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    f41cbcb View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2013

  1. Added profile. Bumped up the number of planets. Now I also have a tile 

    size.
    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    12b7d7a View commit details
    Browse the repository at this point in the history

  2. Code is down for tiling, but with our small initial example it doesn't 

    do anything
    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    9236bd4 View commit details
    Browse the repository at this point in the history

  3. Shared works for 32 bodies (one tile)

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    2837e89 View commit details
    Browse the repository at this point in the history

  4. Now using shared memory works for 64 bodies

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    da3f054 View commit details
    Browse the repository at this point in the history

  5. Now working on 1024 bodies. Shared memory actually makes it worse with 

    current params.
    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    452bcaf View commit details
    Browse the repository at this point in the history

  6. Added implicit Euler

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    8227fca View commit details
    Browse the repository at this point in the history

  7. Using a cutoff radius gets us better results.

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    9879c9d View commit details
    Browse the repository at this point in the history

  8. Last commit before we try prefetching

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    9ea2448 View commit details
    Browse the repository at this point in the history

  9. Loop unrolling appears to work!

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    1bc38a5 View commit details
    Browse the repository at this point in the history

  10. Now we don't have to manually adjust the tile size. Still appears to be 

    working fine.
    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    7406d23 View commit details
    Browse the repository at this point in the history

  11. Changed blockSize so that now we pass it in

    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    807ec3d View commit details
    Browse the repository at this point in the history

  12. Went ahead and proved that the tile size CAN be larger than the block 

    size. It just can't be larger than the number of bodies.
    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    0217fef View commit details
    Browse the repository at this point in the history

  13. Now we can print out the elapsed time for the first 100 kernel execut… 

    …ions.
    nmarshak1337 committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    32584c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2013

  1. Last commit before we attempt to add collisions!

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    7a315e3 View commit details
    Browse the repository at this point in the history

  2. Code down for collisions

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    1da2776 View commit details
    Browse the repository at this point in the history

  3. Almost ready to add in collisions.

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    1530f48 View commit details
    Browse the repository at this point in the history

  4. Added collisions. Not quite working... is the radius too small?

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    5a1feee View commit details
    Browse the repository at this point in the history

  5. Collisions seem to work. Radius is small

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    7c7e571 View commit details
    Browse the repository at this point in the history

  6. It works! Penalty force seems a little funny though

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    099fc9b View commit details
    Browse the repository at this point in the history

  7. Elastic collisions work!

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    7ef81c9 View commit details
    Browse the repository at this point in the history

  8. Collision detection works well, with nice clumping.

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    f50fd26 View commit details
    Browse the repository at this point in the history

  9. Going back to no collisions for nao.

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    6f91518 View commit details
    Browse the repository at this point in the history

  10. Last commit before adding RK4

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    a5c67e8 View commit details
    Browse the repository at this point in the history

  11. Updated README

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    681b3e8 View commit details
    Browse the repository at this point in the history

  12. Revert "Updated README" 

    This reverts commit 681b3e8.
    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    b91bb5a View commit details
    Browse the repository at this point in the history

  13. Revert "Last commit before adding RK4" 

    This reverts commit a5c67e8.
    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    74a57a3 View commit details
    Browse the repository at this point in the history

  14. Collision detection is now back in!

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    c25a416 View commit details
    Browse the repository at this point in the history

  15. Now we are back to the "standard" demo. Time to add flocking!

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    105963f View commit details
    Browse the repository at this point in the history

  16. Now collisions conserve energy (or at least are better at conserving 

    energy).
    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    c93f600 View commit details
    Browse the repository at this point in the history

  17. Duplicated the nbody project in order to start with flocking.

    nmarshak1337 committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    d43a784 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2013

  1. Well, the star mass is zero. I'll figure out how to get rid of it later.

    nmarshak1337 committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    c6fb6a0 View commit details
    Browse the repository at this point in the history

  2. Well, now we have a pointer to the device position vector

    nmarshak1337 committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    5c1440c View commit details
    Browse the repository at this point in the history

  3. Got the guy to work. It's a little buggy though.

    nmarshak1337 committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    524ebee View commit details
    Browse the repository at this point in the history

  4. Added control law. Dunno if it works though.

    nmarshak1337 committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    a4acc1e View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2013

  1. Well, now we get the ball moving independetly of the other stuff

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    2121915 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/nmarshak1337/CUDA-NBody-Sim 

    Conflicts:
	Part2/src/kernel.cu
    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    df5be3b View commit details
    Browse the repository at this point in the history

  3. Now it actually works.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    a454db5 View commit details
    Browse the repository at this point in the history

  4. Got seek working. Disabled collisions, because it causes horrible, 

    horrible things to happen
    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    0954019 View commit details
    Browse the repository at this point in the history

  5. Got arrival working, I think.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    794b798 View commit details
    Browse the repository at this point in the history

  6. Separation works!

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    f0a7147 View commit details
    Browse the repository at this point in the history

  7. Added enum for behavior type

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    311df47 View commit details
    Browse the repository at this point in the history

  8. Switching between states works. Separation spazzes a bit when agents are 

    too close.
    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    99021bf View commit details
    Browse the repository at this point in the history

  9. Prevented separation from spazzing.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    9a8a4e5 View commit details
    Browse the repository at this point in the history

  10. Leader following works

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    6e67966 View commit details
    Browse the repository at this point in the history

  11. Turned the planets into triangles. I just need the triangles to rotat… 

    …e nao
    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    26ba57f View commit details
    Browse the repository at this point in the history

  12. Got triangles to rotate! Yippee!

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    287d8ad View commit details
    Browse the repository at this point in the history

  13. We've proved that we change rotation dynamically. Now it's time to 

    actually apply rotations and torques.
    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    28f76da View commit details
    Browse the repository at this point in the history

  14. Got the rotation array working.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    ac97e3f View commit details
    Browse the repository at this point in the history

  15. Angles are expressed as FLOATS now.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    792eb30 View commit details
    Browse the repository at this point in the history

  16. Added angular velocity array

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    b7252f8 View commit details
    Browse the repository at this point in the history

  17. Code is down for calculation of control torque.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    56269b1 View commit details
    Browse the repository at this point in the history

  18. Base framework is now there for angular accelerations.

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    b0a3074 View commit details
    Browse the repository at this point in the history

  19. Well, now we have torques. Phew!

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    4744d27 View commit details
    Browse the repository at this point in the history

  20. Ready to drop in numerical integration of angle/angular velocity

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    a633f8c View commit details
    Browse the repository at this point in the history

  21. Numerical integration of angular acceleration is there. Now to give it a 

    target angle to rotate to...
    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    bba641a View commit details
    Browse the repository at this point in the history

  22. Angle control works... sort of!

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    89ffc51 View commit details
    Browse the repository at this point in the history

  23. Got angle control to work!

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    3e93738 View commit details
    Browse the repository at this point in the history

  24. Updated README

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    790f6d8 View commit details
    Browse the repository at this point in the history

  25. We are back to using shared, tile size and block size are both 128

    nmarshak1337 committed Oct 23, 2013
    Configuration menu
    Copy the full SHA
    0d4df48 View commit details
    Browse the repository at this point in the history