Commit 600f9e92 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Code formatting

parent f8cb8715
......@@ -434,7 +434,7 @@ void DOPAIR_SUBSET(struct runner *r, struct cell *restrict ci,
struct engine *e = r->e;
#ifdef WITH_MPI
if(ci->nodeID != cj->nodeID) {
if (ci->nodeID != cj->nodeID) {
DOPAIR_SUBSET_NOSORT(r, ci, parts_i, ind, count, cj);
return;
}
......@@ -726,7 +726,7 @@ void DOPAIR1(struct runner *r, struct cell *ci, struct cell *cj) {
const struct engine *restrict e = r->e;
#ifdef WITH_MPI
if(ci->nodeID != cj->nodeID) {
if (ci->nodeID != cj->nodeID) {
DOPAIR1_NOSORT(r, ci, cj);
return;
}
......@@ -938,7 +938,7 @@ void DOPAIR2(struct runner *r, struct cell *ci, struct cell *cj) {
struct engine *restrict e = r->e;
#ifdef WITH_MPI
if(ci->nodeID != cj->nodeID) {
if (ci->nodeID != cj->nodeID) {
DOPAIR2_NOSORT(r, ci, cj);
return;
}
......
......@@ -6,8 +6,7 @@
* @param ci The first #cell.
* @param cj The second #cell.
*/
void DOPAIR1_NOSORT(struct runner *r, struct cell *ci,
struct cell *cj) {
void DOPAIR1_NOSORT(struct runner *r, struct cell *ci, struct cell *cj) {
const struct engine *e = r->e;
......@@ -71,7 +70,6 @@ void DOPAIR1_NOSORT(struct runner *r, struct cell *ci,
} /* loop over the parts in ci. */
/* Loop over the parts in cj. */
for (int pjd = 0; pjd < count_j; pjd++) {
......@@ -115,11 +113,9 @@ void DOPAIR1_NOSORT(struct runner *r, struct cell *ci,
} /* loop over the parts in cj. */
TIMER_TOC(TIMER_DOPAIR);
}
/**
* @brief Compute the interactions between a cell pair.
*
......@@ -127,8 +123,7 @@ void DOPAIR1_NOSORT(struct runner *r, struct cell *ci,
* @param ci The first #cell.
* @param cj The second #cell.
*/
void DOPAIR2_NOSORT(struct runner *r, struct cell *ci,
struct cell *cj) {
void DOPAIR2_NOSORT(struct runner *r, struct cell *ci, struct cell *cj) {
const struct engine *e = r->e;
......@@ -193,7 +188,6 @@ void DOPAIR2_NOSORT(struct runner *r, struct cell *ci,
} /* loop over the parts in ci. */
/* Loop over the parts in cj. */
for (int pjd = 0; pjd < count_j; pjd++) {
......@@ -238,11 +232,9 @@ void DOPAIR2_NOSORT(struct runner *r, struct cell *ci,
} /* loop over the parts in cj. */
TIMER_TOC(TIMER_DOPAIR);
}
/**
* @brief Compute the interactions between a cell pair, but only for the
* given indices in ci.
......@@ -255,12 +247,11 @@ void DOPAIR2_NOSORT(struct runner *r, struct cell *ci,
* @param cj The second #cell.
*/
void DOPAIR_SUBSET_NOSORT(struct runner *r, struct cell *restrict ci,
struct part *restrict parts_i, int *restrict ind, int count,
struct cell *restrict cj) {
struct part *restrict parts_i, int *restrict ind,
int count, struct cell *restrict cj) {
struct engine *e = r->e;
TIMER_TIC;
const int count_j = cj->count;
......@@ -275,7 +266,6 @@ void DOPAIR_SUBSET_NOSORT(struct runner *r, struct cell *restrict ci,
shift[k] = -e->s->dim[k];
}
/* Loop over the parts_i. */
for (int pid = 0; pid < count; pid++) {
......@@ -286,7 +276,7 @@ void DOPAIR_SUBSET_NOSORT(struct runner *r, struct cell *restrict ci,
const float hi = pi->h;
const float hig2 = hi * hi * kernel_gamma2;
if (!part_is_active(pi, e))
if (!part_is_active(pi, e))
error("Trying to correct smoothing length of inactive particle !");
/* Loop over the parts in cj. */
......@@ -307,10 +297,9 @@ void DOPAIR_SUBSET_NOSORT(struct runner *r, struct cell *restrict ci,
if (r2 < hig2) {
IACT_NONSYM(r2, dx, hi, pj->h, pi, pj);
}
} /* loop over the parts in cj. */
} /* loop over the parts in ci. */
} /* loop over the parts in ci. */
TIMER_TOC(timer_dopair_subset);
}
......@@ -472,7 +472,7 @@ void space_rebuild(struct space *s, int verbose) {
/* Be verbose about this. */
#ifdef SWIFT_DEBUG_CHECKS
if(s->e->nodeID == 0 || verbose) message("re)building space");
if (s->e->nodeID == 0 || verbose) message("re)building space");
fflush(stdout);
#endif
......@@ -845,10 +845,10 @@ void space_parts_get_cell_index_mapper(void *map_data, int nr_parts,
ind[k] = index;
#ifdef SWIFT_DEBUG_CHECKS
if(pos_x > dim_x || pos_y > dim_y || pos_z > pos_z ||
pos_x < 0. || pos_y < 0. || pos_z < 0.)
error("Particle outside of simulation box. p->x=[%e %e %e]",
pos_x, pos_y, pos_z);
if (pos_x > dim_x || pos_y > dim_y || pos_z > pos_z || pos_x < 0. ||
pos_y < 0. || pos_z < 0.)
error("Particle outside of simulation box. p->x=[%e %e %e]", pos_x, pos_y,
pos_z);
#endif
/* Update the position */
......@@ -1014,7 +1014,7 @@ void space_parts_sort(struct space *s, int *ind, size_t N, int min, int max,
if (ind[i - 1] > ind[i])
error("Sorting failed (ind[%zu]=%i,ind[%zu]=%i), min=%i, max=%i.", i - 1,
ind[i - 1], i, ind[i], min, max);
if(s->e->nodeID == 0 || verbose) message("Sorting succeeded.");
if (s->e->nodeID == 0 || verbose) message("Sorting succeeded.");
#endif
/* Clean up. */
......@@ -1192,7 +1192,7 @@ void space_gparts_sort(struct space *s, int *ind, size_t N, int min, int max,
if (ind[i - 1] > ind[i])
error("Sorting failed (ind[%zu]=%i,ind[%zu]=%i), min=%i, max=%i.", i - 1,
ind[i - 1], i, ind[i], min, max);
if(s->e->nodeID == 0 || verbose) message("Sorting succeeded.");
if (s->e->nodeID == 0 || verbose) message("Sorting succeeded.");
#endif
/* Clean up. */
......
Markdown is supported
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