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

Conflicts:
	src/SPIN/pair_spin_exchange.cpp
	src/atom.cpp
	src/pair.cpp
This commit is contained in:
julient31
2019-04-19 15:02:25 -06:00
4475 changed files with 423708 additions and 327416 deletions

View File

@ -42,7 +42,7 @@ fix 3 all nve/spin lattice yes
timestep 0.0001
compute out_mag all compute/spin
compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp