Skip to content
Snippets Groups Projects
Commit 01609f55 authored by Tim Mattox's avatar Tim Mattox
Browse files

USER-DPD: bugfix for a segfault when using MOLECULE and DPD together.

parent d2fc88a6
No related branches found
No related tags found
No related merge requests found
...@@ -251,8 +251,8 @@ void NPairHalfBinNewtonSSA::build(NeighList *list) ...@@ -251,8 +251,8 @@ void NPairHalfBinNewtonSSA::build(NeighList *list)
static int cmp_ssaAIR(const void *iptr, const void *jptr) static int cmp_ssaAIR(const void *iptr, const void *jptr)
{ {
int i = *((int *) iptr); int i = NEIGHMASK & *((int *) iptr);
int j = *((int *) jptr); int j = NEIGHMASK & *((int *) jptr);
if (ssaAIRptr[i] < ssaAIRptr[j]) return -1; if (ssaAIRptr[i] < ssaAIRptr[j]) return -1;
if (ssaAIRptr[i] > ssaAIRptr[j]) return 1; if (ssaAIRptr[i] > ssaAIRptr[j]) return 1;
return 0; return 0;
......
...@@ -123,8 +123,8 @@ void NPairHalffullNewtonSSA::build(NeighList *list) ...@@ -123,8 +123,8 @@ void NPairHalffullNewtonSSA::build(NeighList *list)
static int cmp_ssaAIR(const void *iptr, const void *jptr) static int cmp_ssaAIR(const void *iptr, const void *jptr)
{ {
int i = *((int *) iptr); int i = NEIGHMASK & *((int *) iptr);
int j = *((int *) jptr); int j = NEIGHMASK & *((int *) jptr);
if (ssaAIRptr[i] < ssaAIRptr[j]) return -1; if (ssaAIRptr[i] < ssaAIRptr[j]) return -1;
if (ssaAIRptr[i] > ssaAIRptr[j]) return 1; if (ssaAIRptr[i] > ssaAIRptr[j]) return 1;
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment