Skip to content

Commit b3337f9

Browse files
committed
commiting before delete local copy
1 parent 01f540c commit b3337f9

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

dataflocking.xlsx

29.2 KB
Binary file not shown.

settingUp.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
have git bash installed.
2+
rclick in window and bring up a git bash
3+
do (without quotes):
4+
"mkdir build; cd build; cmake-gui .."
5+
click configure (might have to copy ), then generate, then open project

src/kernel.cu

+2-2
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@ __global__ void kernUpdateVelNeighborSearchScattered(const int N, const int grid
484484

485485
//glm::vec3 diff( cellxyz_float.x - cellxyz.x, cellxyz_float.y - cellxyz.y, cellxyz_float.z - cellxyz.z);
486486
//glm::ivec3 sign = glm::sign(diff - glm::vec3(0.5f, 0.5f, 0.5f));//1 vs -1 tells you where the point lies in relation to the xyz planes that spit the cell into 8 regions
487-
//sign = (sign - 1) / 2; //converts to -1 or 0, flips a border neighbor cell to the other side (-1) or leaves it there (0)
488-
//for (int i = 0; i < possible_neighbs; ++i) {
487+
////sign = (sign - 1) / 2; //converts from -1 or 1 to -1 or 0, flips a border neighbor cell to the other side (-1) or leaves it there (0)
488+
//for (int i = 0; i < MAXNEIGHBS; ++i) {
489489
// const glm::ivec3 idx( (i&1)*sign.x + cellxyz.x, (i&2)*sign.y + cellxyz.y, (i&4)*sign.z + cellxyz.z);
490490
// const int cellidx1d = gridIndex3Dto1D(idx, gridResolution);
491491
// if (idx.x < 0 || idx.y < 0 || idx.z < 0 || idx.x >= gridResolution || idx.y >= gridResolution || idx.z >= gridResolution

src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// LOOK-2.1 LOOK-2.3 - toggles for UNIFORM_GRID and COHERENT_GRID
1616
#define VISUALIZE 1
1717
#define UNIFORM_GRID 1
18-
#define COHERENT_GRID 1
18+
#define COHERENT_GRID 0
1919

2020

2121
// LOOK-1.2 - change this to adjust particle count in the simulation

0 commit comments

Comments
 (0)