Merge branch 'master' into lammps-icms

Resolve Conflicts:
	src/region.cpp
This commit is contained in:
Axel Kohlmeyer
2012-06-30 11:23:32 -04:00
241 changed files with 22861 additions and 2137 deletions

View File

@ -357,7 +357,7 @@ void ChangeBox::command(int narg, char **arg)
// use irregular() in case box moved a long distance relative to atoms
double **x = atom->x;
int *image = atom->image;
tagint *image = atom->image;
int nlocal = atom->nlocal;
for (i = 0; i < nlocal; i++) domain->remap(x[i],image[i]);