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@11162 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-01-07 21:03:02 +00:00
parent 98b33ca794
commit 83d75279ae
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/GRANULAR/pair_gran_hooke_history.cpp
View File

@ -474,14 +474,18 @@ void PairGranHookeHistory::init_style()
int itype; int itype;
for (i = 1; i <= atom->ntypes; i++) { for (i = 1; i <= atom->ntypes; i++) {
onerad_dynamic[i] = onerad_frozen[i] = 0.0; onerad_dynamic[i] = onerad_frozen[i] = 0.0;
if (ipour >= 0) if (ipour >= 0) {
itype = i;
onerad_dynamic[i] = onerad_dynamic[i] =
*((double *) modify->fix[ipour]->extract("radius",itype)); *((double *) modify->fix[ipour]->extract("radius",itype));
if (idep >= 0) }
if (idep >= 0) {
itype = i;
onerad_dynamic[i] = onerad_dynamic[i] =
*((double *) modify->fix[idep]->extract("radius",itype)); *((double *) modify->fix[idep]->extract("radius",itype));
}
} }
double *radius = atom->radius; double *radius = atom->radius;
int *mask = atom->mask; int *mask = atom->mask;
int *type = atom->type; int *type = atom->type;