From 0ebed7a7414414639a29c365da33cfc1a49f1d24 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Mon, 5 Jun 2017 14:48:59 +0100
Subject: [PATCH] Use dx_max_sort_old and not dx_max_sort when checking whether
cells have been sorted in DOPAIR1_BRANCH()
---
src/runner_doiact.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index 8ef355c090..399c96c200 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -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);
/* 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.");
- 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.");
- /* 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) && \
(DOPAIR1_BRANCH == runner_dopair1_density_branch)
if (!sort_is_corner(sid))
--
GitLab