Skip to content
Snippets Groups Projects
Commit b4f29fee authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

first pass through space.c.

parent 2e9a2c28
No related branches found
No related tags found
1 merge request!137size_t
...@@ -167,7 +167,7 @@ void space_regrid(struct space *s, double cell_max, int verbose) { ...@@ -167,7 +167,7 @@ void space_regrid(struct space *s, double cell_max, int verbose) {
if (s->cells[k].h_max > h_max) h_max = s->cells[k].h_max; if (s->cells[k].h_max > h_max) h_max = s->cells[k].h_max;
} }
} else { } else {
for (int k = 0; k < nr_parts; k++) { for (size_t k = 0; k < nr_parts; k++) {
if (s->parts[k].h > h_max) h_max = s->parts[k].h; if (s->parts[k].h > h_max) h_max = s->parts[k].h;
} }
s->h_max = h_max; s->h_max = h_max;
...@@ -314,8 +314,8 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -314,8 +314,8 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
/* Re-grid if necessary, or just re-set the cell data. */ /* Re-grid if necessary, or just re-set the cell data. */
space_regrid(s, cell_max, verbose); space_regrid(s, cell_max, verbose);
int nr_parts = s->nr_parts; size_t nr_parts = s->nr_parts;
int nr_gparts = s->nr_gparts; size_t nr_gparts = s->nr_gparts;
struct cell *restrict cells = s->cells; struct cell *restrict cells = s->cells;
const double ih[3] = {s->ih[0], s->ih[1], s->ih[2]}; const double ih[3] = {s->ih[0], s->ih[1], s->ih[2]};
...@@ -328,7 +328,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -328,7 +328,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
int *ind; int *ind;
if ((ind = (int *)malloc(sizeof(int) * ind_size)) == NULL) if ((ind = (int *)malloc(sizeof(int) * ind_size)) == NULL)
error("Failed to allocate temporary particle indices."); error("Failed to allocate temporary particle indices.");
for (int k = 0; k < nr_parts; k++) { for (size_t k = 0; k < nr_parts; k++) {
struct part *restrict p = &s->parts[k]; struct part *restrict p = &s->parts[k];
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
if (p->x[j] < 0.0) if (p->x[j] < 0.0)
...@@ -365,7 +365,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -365,7 +365,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
#ifdef WITH_MPI #ifdef WITH_MPI
/* Move non-local parts to the end of the list. */ /* Move non-local parts to the end of the list. */
const int local_nodeID = s->e->nodeID; const int local_nodeID = s->e->nodeID;
for (int k = 0; k < nr_parts; k++) for (size_t k = 0; k < nr_parts; k++)
if (cells[ind[k]].nodeID != local_nodeID) { if (cells[ind[k]].nodeID != local_nodeID) {
cells[ind[k]].count -= 1; cells[ind[k]].count -= 1;
nr_parts -= 1; nr_parts -= 1;
...@@ -431,7 +431,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -431,7 +431,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
} }
/* Assign each particle to its cell. */ /* Assign each particle to its cell. */
for (int k = nr_parts; k < s->nr_parts; k++) { for (size_t k = nr_parts; k < s->nr_parts; k++) {
const struct part *const p = &s->parts[k]; const struct part *const p = &s->parts[k];
ind[k] = ind[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]);
...@@ -447,7 +447,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) { ...@@ -447,7 +447,7 @@ void space_rebuild(struct space *s, double cell_max, int verbose) {
space_parts_sort(s, ind, nr_parts, 0, s->nr_cells - 1, verbose); space_parts_sort(s, ind, nr_parts, 0, s->nr_cells - 1, verbose);
/* Re-link the gparts. */ /* Re-link the gparts. */
for (int k = 0; k < nr_parts; k++) for (size_t k = 0; k < nr_parts; k++)
if (s->parts[k].gpart != NULL) s->parts[k].gpart->part = &s->parts[k]; if (s->parts[k].gpart != NULL) s->parts[k].gpart->part = &s->parts[k];
/* Verify space_sort_struct. */ /* Verify space_sort_struct. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment