Commit 30babd81 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #485 from akohlmey/pair_settings_cut_bugfix 

Bugfix for correct resetting of previously set cutoffs to various Pair::settings() functions
parents aa09f45b 51fc386e

src/ASPHERE/pair_gayberne.cpp

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ void PairGayBerne::settings(int narg, char **arg) 
  if (allocated) {

    int i,j;

    for (i = 1; i <= atom->ntypes; i++)

      for (j = i+1; j <= atom->ntypes; j++)

      for (j = i; j <= atom->ntypes; j++)

        if (setflag[i][j]) cut[i][j] = cut_global;

  }

}

src/ASPHERE/pair_line_lj.cpp

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ void PairLineLJ::settings(int narg, char **arg) 
  if (allocated) {

    int i,j;

    for (i = 1; i <= atom->ntypes; i++)

      for (j = i+1; j <= atom->ntypes; j++)

      for (j = i; j <= atom->ntypes; j++)

        if (setflag[i][j]) cut[i][j] = cut_global;

  }

}

src/ASPHERE/pair_resquared.cpp

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void PairRESquared::settings(int narg, char **arg) 
  if (allocated) {

    int i,j;

    for (i = 1; i <= atom->ntypes; i++)

      for (j = i+1; j <= atom->ntypes; j++)

      for (j = i; j <= atom->ntypes; j++)

        if (setflag[i][j]) cut[i][j] = cut_global;

  }

}

src/ASPHERE/pair_tri_lj.cpp

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ void PairTriLJ::settings(int narg, char **arg) 
  if (allocated) {

    int i,j;

    for (i = 1; i <= atom->ntypes; i++)

      for (j = i+1; j <= atom->ntypes; j++)

      for (j = i; j <= atom->ntypes; j++)

        if (setflag[i][j]) cut[i][j] = cut_global;

  }

}

src/BODY/pair_body.cpp

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ void PairBody::settings(int narg, char **arg) 
  if (allocated) {

    int i,j;

    for (i = 1; i <= atom->ntypes; i++)

      for (j = i+1; j <= atom->ntypes; j++)

      for (j = i; j <= atom->ntypes; j++)

        if (setflag[i][j]) cut[i][j] = cut_global;

  }

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE