Merge branch 'master' into feature-cnt

2020-03-06 18:41:38 -05:00
parent 8c82c60f2f 8c580c1d47
commit bdbbe00ec7
1003 changed files with 21321 additions and 10773 deletions
--- a/src/atom.cpp
+++ b/src/atom.cpp
@ -181,6 +181,8 @@ Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
  spin_flag = eradius_flag = ervel_flag = erforce_flag = ervelforce_flag = 0;
  cs_flag = csforce_flag = vforce_flag = etag_flag = 0;

+  // USER-SPH, USER-MESO, and USER-DPD flags
+
  rho_flag = e_flag = cv_flag = vest_flag = 0;
  dpd_flag = edpd_flag = tdpd_flag = 0;