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

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

Browse Source 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	examples/USER/openmp/parm.pegc12e8
	examples/USER/openmp/parm.pegc12e8-omp
This commit is contained in:
Axel Kohlmeyer
2014-04-09 13:49:45 +02:00
parent fb3a956155 51f4c3b0cc
commit f8daecd639
10 changed files with 47 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/atom.cpp
View File

@ -162,7 +162,7 @@ Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
tag_enable = 1;
map_style = map_user = 0;
map_tag_max = -1;
map_maxarray = map_nhash = 0;
map_maxarray = map_nhash = -1;
max_same = 0;
sametag = NULL;
@ -480,6 +480,7 @@ void Atom::modify_params(int narg, char **arg)
if (strcmp(arg[iarg+1],"array") == 0) map_user = 1;
else if (strcmp(arg[iarg+1],"hash") == 0) map_user = 2;
else error->all(FLERR,"Illegal atom_modify command");
map_style = map_user;
iarg += 2;
} else if (strcmp(arg[iarg],"first") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal atom_modify command");