6 Commits

Author	SHA1	Message	Date
Axel Kohlmeyer	1e9a4cc4b8	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms ... # Resolved Conflicts: # doc/Manual.html # doc/Manual.txt # src/REAX/fix_reax_bonds.cpp # src/REAX/fix_reax_bonds.h # src/REAX/pair_reax.cpp # src/USER-MGPT/pair_mgpt.cpp # src/USER-SMTBQ/pair_smtbq.cpp # src/lammps.cpp # src/timer.cpp	2015-10-31 10:54:08 -04:00
sjplimp	354e20f431	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14220 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2015-10-30 20:04:06 +00:00
Axel Kohlmeyer	9333dc8147	make sure we return 0.0 in case no scalar compute condition is met	2015-10-23 19:21:07 -04:00
sjplimp	abe4c06219	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14138 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2015-10-21 19:34:58 +00:00
sjplimp	b036260091	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14135 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2015-10-21 19:28:22 +00:00
sjplimp	d145ae099e	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14134 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2015-10-21 19:27:14 +00:00