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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11739 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-04-08 17:35:21 +00:00
parent bf03a003f8
commit fafdfbf5fe
2 changed files with 3 additions and 1 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; tag_enable = 1;
map_style = map_user = 0; map_style = map_user = 0;
map_tag_max = -1; map_tag_max = -1;
map_maxarray = map_nhash = 0; map_maxarray = map_nhash = -1;
max_same = 0; max_same = 0;
sametag = NULL; sametag = NULL;
@ -480,6 +480,7 @@ void Atom::modify_params(int narg, char **arg)
if (strcmp(arg[iarg+1],"array") == 0) map_user = 1; if (strcmp(arg[iarg+1],"array") == 0) map_user = 1;
else if (strcmp(arg[iarg+1],"hash") == 0) map_user = 2; else if (strcmp(arg[iarg+1],"hash") == 0) map_user = 2;
else error->all(FLERR,"Illegal atom_modify command"); else error->all(FLERR,"Illegal atom_modify command");
map_style = map_user;
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"first") == 0) { } else if (strcmp(arg[iarg],"first") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal atom_modify command"); if (iarg+2 > narg) error->all(FLERR,"Illegal atom_modify command");

1
src/atom_map.cpp
View File

@ -37,6 +37,7 @@ void Atom::map_init(int check)
// check for new map style if max atomID changed (check = 1 = default) // check for new map style if max atomID changed (check = 1 = default)
// recreate = 1 if must delete old map and create new map // recreate = 1 if must delete old map and create new map
// recreate = 0 if can re-use old map w/out realloc and just adjust settings // recreate = 0 if can re-use old map w/out realloc and just adjust settings
// map_maxarray/map_nhash initially -1, to force recreate even when no atoms
int recreate = 0; int recreate = 0;
if (check) recreate = map_style_set(); if (check) recreate = map_style_set();