ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Browse Source 
Resolved Conflicts:
	doc/Manual.txt
	src/RIGID/fix_shake.cpp
	src/variable.cpp
	src/write_data.cpp
This commit is contained in:
Axel Kohlmeyer
2014-01-26 21:35:32 -05:00
parent e126d82aaa 806a382bd0
commit 39b1597778
171 changed files with 3661 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/input.cpp
View File

@ -1517,7 +1517,7 @@ void Input::special_bonds()
// if simulation box defined and saved values changed, redo special list
if (domain->box_exist && atom->molecular) {
if (domain->box_exist && atom->molecular == 1) {
if (lj2 != force->special_lj[2] || lj3 != force->special_lj[3] ||
coul2 != force->special_coul[2] || coul3 != force->special_coul[3] ||
angle != force->special_angle ||