Commit 7088644a authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Post-merge changes

parent 8a86e252
...@@ -480,7 +480,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -480,7 +480,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
const struct gpart *const p = &s->gparts[k]; const struct gpart *const p = &s->gparts[k];
gind[k] = gind[k] =
cell_getid(cdim, p->x[0] * ih[0], p->x[1] * ih[1], p->x[2] * ih[2]); cell_getid(cdim, p->x[0] * ih[0], p->x[1] * ih[1], p->x[2] * ih[2]);
cells[gind[k]].count += 1; cells[gind[k]].gcount += 1;
/* if ( cells[ ind[k] ].nodeID != nodeID ) /* if ( cells[ ind[k] ].nodeID != nodeID )
error( "Received part that does not belong to me (nodeID=%i)." , cells[ error( "Received part that does not belong to me (nodeID=%i)." , cells[
ind[k] ].nodeID ); */ ind[k] ].nodeID ); */
...@@ -490,7 +490,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -490,7 +490,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
#endif #endif
/* Sort the parts according to their cells. */ /* Sort the parts according to their cells. */
space_gparts_sort(s->gparts, gind, nr_gparts, 0, s->nr_cells - 1); space_gparts_sort(s, gind, nr_gparts, 0, s->nr_cells - 1, verbose);
/* Re-link the parts. */ /* Re-link the parts. */
for (int k = 0; k < nr_gparts; k++) for (int k = 0; k < nr_gparts; k++)
...@@ -739,7 +739,7 @@ void space_do_parts_sort() { ...@@ -739,7 +739,7 @@ void space_do_parts_sort() {
* @param max highest index. * @param max highest index.
* @param verbose Are we talkative ? * @param verbose Are we talkative ?
*/ */
void space_gparts_sort(struct space *s, size_t *ind, size_t N, int min, int max, void space_gparts_sort(struct space *s, int *ind, size_t N, int min, int max,
int verbose) { int verbose) {
const ticks tic = getticks(); const ticks tic = getticks();
...@@ -786,7 +786,7 @@ void space_gparts_sort(struct space *s, size_t *ind, size_t N, int min, int max, ...@@ -786,7 +786,7 @@ void space_gparts_sort(struct space *s, size_t *ind, size_t N, int min, int max,
void space_do_gparts_sort() { void space_do_gparts_sort() {
/* Pointers to the sorting data. */ /* Pointers to the sorting data. */
size_t *ind = space_sort_struct.ind; int *ind = space_sort_struct.ind;
struct gpart *gparts = space_sort_struct.gparts; struct gpart *gparts = space_sort_struct.gparts;
/* Main loop. */ /* Main loop. */
...@@ -902,15 +902,6 @@ void space_do_gparts_sort() { ...@@ -902,15 +902,6 @@ void space_do_gparts_sort() {
atomic_dec(&space_sort_struct.waiting); atomic_dec(&space_sort_struct.waiting);
} /* main loop. */ } /* main loop. */
/* Verify space_sort_struct. */
/* for ( i = 1 ; i < N ; i++ )
if ( ind[i-1] > ind[i] )
error( "Sorting failed (ind[%i]=%i,ind[%i]=%i)." , i-1 , ind[i-1] , i
, ind[i] ); */
/* Clean up. */
free(qstack);
} }
/** /**
......
...@@ -130,7 +130,7 @@ extern struct parallel_sort space_sort_struct; ...@@ -130,7 +130,7 @@ extern struct parallel_sort space_sort_struct;
/* function prototypes. */ /* function prototypes. */
void space_parts_sort(struct space *s, int *ind, size_t N, int min, int max, void space_parts_sort(struct space *s, int *ind, size_t N, int min, int max,
int verbose); int verbose);
void space_gparts_sort(struct space *s, size_t *ind, size_t N, int min, int max, void space_gparts_sort(struct space *s, int *ind, size_t N, int min, int max,
int verbose); int verbose);
struct cell *space_getcell(struct space *s); struct cell *space_getcell(struct space *s);
int space_getsid(struct space *s, struct cell **ci, struct cell **cj, int space_getsid(struct space *s, struct cell **ci, struct cell **cj,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment