Skip to content

Nathan's pull request #18

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
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

Conversation

n8xm
Copy link

@n8xm n8xm commented Oct 23, 2013

All done!

nmarshak1337 added 30 commits October 19, 2013 02:39
Now we have simple force calculation working.
ba1310f
Got the basic height field working.
8e8b438
Well, now we no longer hit any debug asserts.
b38c305
Now we have the naive force calculation working.
aac4c75
Merge remote-tracking branch 'upstream/master'
1563889
Now we can draw the planets as squares. Yay!
0cb976d
Now we have our nice spacetime shader. Time to move onto using shared
3ab774e 
memory.
Performance comparison done on naiveAcc. Time to implement sharedAcc.
0657af0
Code is down for shared memory, and it compiles. Next step is to see …
753c509 
…if it

works.
Working with shared memory!
f41cbcb
Added profile. Bumped up the number of planets. Now I also have a tile
12b7d7a 
size.
Code is down for tiling, but with our small initial example it doesn't
9236bd4 
do anything
Shared works for 32 bodies (one tile)
2837e89
Now using shared memory works for 64 bodies
da3f054
Now working on 1024 bodies. Shared memory actually makes it worse with
452bcaf 
current params.
Added implicit Euler
8227fca
Using a cutoff radius gets us better results.
9879c9d
Last commit before we try prefetching
9ea2448
Loop unrolling appears to work!
1bc38a5
Now we don't have to manually adjust the tile size. Still appears to be
7406d23 
working fine.
Changed blockSize so that now we pass it in
807ec3d
Went ahead and proved that the tile size CAN be larger than the block
0217fef 
size. It just can't be larger than the number of bodies.
Now we can print out the elapsed time for the first 100 kernel execut…
32584c9 
…ions.
Last commit before we attempt to add collisions!
7a315e3
Code down for collisions
1da2776
Almost ready to add in collisions.
1530f48
Added collisions. Not quite working... is the radius too small?
5a1feee
Collisions seem to work. Radius is small
7c7e571
It works! Penalty force seems a little funny though
099fc9b
Elastic collisions work!
7ef81c9
nmarshak1337 added 30 commits October 21, 2013 17:06
Duplicated the nbody project in order to start with flocking.
d43a784
Well, the star mass is zero. I'll figure out how to get rid of it later.
c6fb6a0
Well, now we have a pointer to the device position vector
5c1440c
Got the guy to work. It's a little buggy though.
524ebee
Added control law. Dunno if it works though.
a4acc1e
Well, now we get the ball moving independetly of the other stuff
2121915
Merge branch 'master' of https://github.com/nmarshak1337/CUDA-NBody-Sim
df5be3b 
Conflicts:
	Part2/src/kernel.cu
Now it actually works.
a454db5
Got seek working. Disabled collisions, because it causes horrible,
0954019 
horrible things to happen
Got arrival working, I think.
794b798
Separation works!
f0a7147
Added enum for behavior type
311df47
Switching between states works. Separation spazzes a bit when agents are
99021bf 
too close.
Prevented separation from spazzing.
9a8a4e5
Leader following works
6e67966
Turned the planets into triangles. I just need the triangles to rotat…
26ba57f 
…e nao
Got triangles to rotate! Yippee!
287d8ad
We've proved that we change rotation dynamically. Now it's time to
28f76da 
actually apply rotations and torques.
Got the rotation array working.
ac97e3f
Angles are expressed as FLOATS now.
792eb30
Added angular velocity array
b7252f8
Code is down for calculation of control torque.
56269b1
Base framework is now there for angular accelerations.
b0a3074
Well, now we have torques. Phew!
4744d27
Ready to drop in numerical integration of angle/angular velocity
a633f8c
Numerical integration of angular acceleration is there. Now to give it a
bba641a 
target angle to rotate to...
Angle control works... sort of!
89ffc51
Got angle control to work!
3e93738
Updated README
790f6d8
We are back to using shared, tile size and block size are both 128
0d4df48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@n8xm