Merge branch 'clean-master2' of github.com:julient31/lammps into pppm_spin

Conflicts: src/SPIN/fix_nve_spin.h
2019-05-14 17:41:58 -06:00
parent cb6b498127 98702cc0b9
commit fd168068a1
264 changed files with 55273 additions and 2505 deletions
--- a/src/SPIN/atom_vec_spin.cpp
+++ b/src/SPIN/atom_vec_spin.cpp
@ -949,6 +949,10 @@ bigint AtomVecSpin::memory_usage()
  return bytes;
 }

+/* ----------------------------------------------------------------------
+   clear all forces (mech and mag)
+------------------------------------------------------------------------- */
+
 void AtomVecSpin::force_clear(int /*n*/, size_t nbytes)
 {
  memset(&atom->f[0][0],0,3*nbytes);