anticipate the upcoming 23 oct 2015 patch

This commit is contained in:
Axel Kohlmeyer
2015-10-22 19:52:03 -04:00
parent d75b4730d9
commit 09187ebabd
78 changed files with 584 additions and 1534 deletions

View File

@ -152,7 +152,8 @@ void FixSRP::setup_pre_force(int zz)
double delx, dely, delz, rmax, rsq, rsqmax;
double **x = atom->x;
bigint nall = atom->nlocal + atom->nghost;
double xold[nall][3];
double **xold;
memory->create(xold,nall,3,"fix_srp:xold");
// make a copy of all coordinates and tags
// need this because create_atom overwrites ghost atoms
@ -163,7 +164,8 @@ void FixSRP::setup_pre_force(int zz)
}
tagint *tag = atom->tag;
tagint tagold[nall];
tagint *tagold;
memory->create(tagold,nall,"fix_srp:tagold");
for(int i = 0; i < nall; i++){
tagold[i]=tag[i];
@ -212,7 +214,11 @@ void FixSRP::setup_pre_force(int zz)
array[atom->nlocal-1][1] = (double)tagold[j];
nadd++;
}
}
}
// free temporary storage
memory->destroy(xold);
memory->destroy(tagold);
// new total # of atoms
bigint nblocal = atom->nlocal;