Commit Graph

10 Commits

Author SHA1 Message Date
1bc62d40b2 more mostly cosmetic issues found by clang 2013-07-24 23:24:18 +02:00
2b1e3a30bd Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/fix_tune_kspace.txt
	doc/group2ndx.txt
	src/DIPOLE/atom_vec_dipole.cpp
	src/DIPOLE/pair_lj_long_dipole_long.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/PERI/atom_vec_peri.cpp
	src/USER-AWPMD/atom_vec_wavepacket.cpp
	src/USER-COLVARS/README
	src/USER-EFF/atom_vec_electron.cpp
	src/USER-SPH/atom_vec_meso.cpp
	src/atom.h
	src/atom_vec_atomic.cpp
	src/atom_vec_body.cpp
	src/atom_vec_charge.cpp
	src/atom_vec_ellipsoid.cpp
	src/atom_vec_line.cpp
	src/atom_vec_sphere.cpp
	src/atom_vec_tri.cpp
	src/fix_restrain.cpp
	src/force.cpp
	tools/restart2data.cpp
2013-06-28 13:09:52 +02:00
0d55ad722b undo manybody check in anticipation of steve's modified version. 2013-06-27 22:50:54 +02:00
b92fa00337 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10104 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-27 20:15:36 +00:00
cf7f34401c teach pair potentials to open potential files via open_potential() 2013-06-27 20:49:14 +02:00
c43fe0a6f6 idiot-proof defining bonds with manybody potentials
add a test to check if manybody potentials are used with bonds
and (default) exclusion flags that cull pairs from the neighborlist.
now careless use of topology data with resulting in excluded
interactions will generate an error. for the few legitimate use
cases, the test can be turned off.
2013-06-17 21:12:04 +02:00
ef9e700545 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-06 22:47:51 +00:00
9377bfd64b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8205 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-01 17:13:46 +00:00
670b92333d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7615 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-31 00:36:58 +00:00
0dacc993ae git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7254 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-01 14:50:34 +00:00