Commit 93262b52 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #343 from timattox/USER-DPD_bugfix_molecule 

USER-DPD: bugfix for a segfault when using MOLECULE and DPD together.
parents d2fc88a6 01609f55

src/USER-DPD/npair_half_bin_newton_ssa.cpp

+2 −2
Original line number Diff line number Diff line
@@ -251,8 +251,8 @@ void NPairHalfBinNewtonSSA::build(NeighList *list) 


static int cmp_ssaAIR(const void *iptr, const void *jptr)

{

  int i = *((int *) iptr);

  int j = *((int *) jptr);

  int i = NEIGHMASK & *((int *) iptr);

  int j = NEIGHMASK & *((int *) jptr);

  if (ssaAIRptr[i] < ssaAIRptr[j]) return -1;

  if (ssaAIRptr[i] > ssaAIRptr[j]) return 1;

  return 0;

src/USER-DPD/npair_halffull_newton_ssa.cpp

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ void NPairHalffullNewtonSSA::build(NeighList *list) 


static int cmp_ssaAIR(const void *iptr, const void *jptr)

{

  int i = *((int *) iptr);

  int j = *((int *) jptr);

  int i = NEIGHMASK & *((int *) iptr);

  int j = NEIGHMASK & *((int *) jptr);

  if (ssaAIRptr[i] < ssaAIRptr[j]) return -1;

  if (ssaAIRptr[i] > ssaAIRptr[j]) return 1;

  return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE