Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Andrew Schultz
2019-06-19 18:52:47 -04:00
123 changed files with 9368 additions and 3009 deletions

View File

@ -76,7 +76,7 @@ Pair::Pair(LAMMPS *lmp) : Pointers(lmp)
setflag = NULL;
cutsq = NULL;
ewaldflag = pppmflag = msmflag = dispersionflag = tip4pflag = dipoleflag = 0;
ewaldflag = pppmflag = msmflag = dispersionflag = tip4pflag = dipoleflag = spinflag = 0;
reinitflag = 1;
// pair_modify settings