Commit 0ebed7a7 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Use dx_max_sort_old and not dx_max_sort when checking whether cells have been...

Use dx_max_sort_old and not dx_max_sort when checking whether cells have been sorted in DOPAIR1_BRANCH()
parent 4045669d
...@@ -1124,15 +1124,13 @@ void DOPAIR1_BRANCH(struct runner *r, struct cell *ci, struct cell *cj) { ...@@ -1124,15 +1124,13 @@ void DOPAIR1_BRANCH(struct runner *r, struct cell *ci, struct cell *cj) {
const int sid = space_getsid(e->s, &ci, &cj, shift); const int sid = space_getsid(e->s, &ci, &cj, shift);
/* Have the cells been sorted? */ /* Have the cells been sorted? */
if (!(ci->sorted & (1 << sid)) || ci->dx_max_sort > space_maxreldx * ci->dmin) if (!(ci->sorted & (1 << sid)) ||
ci->dx_max_sort_old > space_maxreldx * ci->dmin)
error("Interacting unsorted cells."); error("Interacting unsorted cells.");
if (!(cj->sorted & (1 << sid)) || cj->dx_max_sort > space_maxreldx * cj->dmin) if (!(cj->sorted & (1 << sid)) ||
cj->dx_max_sort_old > space_maxreldx * cj->dmin)
error("Interacting unsorted cells."); error("Interacting unsorted cells.");
/* Have the cells been sorted? */
if (!(ci->sorted & (1 << sid)) || !(cj->sorted & (1 << sid)))
error("Trying to interact unsorted cells.");
#if defined(WITH_VECTORIZATION) && defined(GADGET2_SPH) && \ #if defined(WITH_VECTORIZATION) && defined(GADGET2_SPH) && \
(DOPAIR1_BRANCH == runner_dopair1_density_branch) (DOPAIR1_BRANCH == runner_dopair1_density_branch)
if (!sort_is_corner(sid)) if (!sort_is_corner(sid))
......
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