anticipate 1 Feb 2014 patch from upstream

This commit is contained in:
Axel Kohlmeyer
2014-01-30 17:21:25 -05:00
parent 889bae9bf8
commit 5136d59713
141 changed files with 499 additions and 2501 deletions

View File

@ -60,7 +60,7 @@ void Atom::map_init()
int recreate = 0;
if (map_style != map_style_old) recreate = 1;
else if (map_style == 1 && map_tag_max > max_array) recreate = 1;
else if (map_style == 1 && map_tag_max > map_maxarray) recreate = 1;
else if (map_style == 2 && nlocal+nghost > map_nhash) recreate = 1;
// if not recreating:
@ -84,8 +84,8 @@ void Atom::map_init()
map_delete();
if (map_style == 1) {
max_array = map_tag_max;
memory->create(map_array,max_array+1,"atom:map_array");
map_maxarray = map_tag_max;
memory->create(map_array,map_maxarray+1,"atom:map_array");
for (int i = 0; i <= map_tag_max; i++) map_array[i] = -1;
} else {