Unverified Commit ae46503b authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1782 from akohlmey/last-minute-fixes 

Last minute bugfix for the upcoming patch release
parents 8f368003 6b3421c9

src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void PairLJCutTIP4PLongOMP::eval(int iifrom, int iito, ThrData * const thr) 
  dbl3_t x1,x2,xH1,xH2;



  int *ilist,*jlist,*numneigh,**firstneigh;

  int i,j,ii,jj,jnum,itype,jtype,itable, key;

  int i,j,ii,jj,jnum,itype,jtype,itable, key=0;

  int n,vlist[6];

  int iH1,iH2,jH1,jH2;

src/pair.cpp

+1 −0
Original line number Diff line number Diff line
@@ -784,6 +784,7 @@ void Pair::ev_setup(int eflag, int vflag, int alloc) 


  vflag_global = vflag % 4;

  vflag_atom = vflag & 4;

  cvflag_atom = 0;



  if (vflag & 8) {

    if (centroidstressflag & 2) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE