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/REPLICA/neb.h
	src/USER-REAXC/fix_qeq_reax.cpp
	src/read_data.h
This commit is contained in:
Axel Kohlmeyer
2014-01-29 07:08:08 -05:00
parent bea87398b3 7f81b2f2ff
commit 8a07871047
198 changed files with 2791 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/read_data.cpp
View File

@ -847,9 +847,9 @@ void ReadData::atoms()
atom->tag_check();
// if molecular system or user-requested, create global mapping of atoms
// create global mapping of atoms
if (atom->molecular || atom->map_user) {
if (atom->map_style) {
atom->map_init();
atom->map_set();
}