diff --git a/src/GRANULAR/pair_gran_hertz_history.cpp b/src/GRANULAR/pair_gran_hertz_history.cpp index 0a0d7c5926..3cf2367e50 100644 --- a/src/GRANULAR/pair_gran_hertz_history.cpp +++ b/src/GRANULAR/pair_gran_hertz_history.cpp @@ -418,13 +418,13 @@ double PairGranHertzHistory::single(int i, int j, int itype, int jtype, // reset neighprev to 0 as necessary int jnum = list->numneigh[i]; - int *touch = list->listgranhistory->firstneigh[i]; + int *jlist = list->firstneigh[i]; double *allshear = list->listgranhistory->firstdouble[i]; for (int jj = 0; jj < jnum; jj++) { neighprev++; if (neighprev >= jnum) neighprev = 0; - if (touch[neighprev] == j) break; + if (jlist[neighprev] == j) break; } double *shear = &allshear[3*neighprev]; diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp index 7f98cfa4e7..fddba13a97 100644 --- a/src/GRANULAR/pair_gran_hooke_history.cpp +++ b/src/GRANULAR/pair_gran_hooke_history.cpp @@ -711,13 +711,13 @@ double PairGranHookeHistory::single(int i, int j, int itype, int jtype, // reset neighprev to 0 as necessary int jnum = list->numneigh[i]; - int *touch = list->listgranhistory->firstneigh[i]; + int *jlist = list->firstneigh[i]; double *allshear = list->listgranhistory->firstdouble[i]; for (int jj = 0; jj < jnum; jj++) { neighprev++; if (neighprev >= jnum) neighprev = 0; - if (touch[neighprev] == j) break; + if (jlist[neighprev] == j) break; } double *shear = &allshear[3*neighprev]; diff --git a/src/MISC/fix_deposit.cpp b/src/MISC/fix_deposit.cpp index 213d39329b..157b3c6879 100644 --- a/src/MISC/fix_deposit.cpp +++ b/src/MISC/fix_deposit.cpp @@ -96,6 +96,13 @@ FixDeposit::FixDeposit(LAMMPS *lmp, int narg, char **arg) : error->all(FLERR,"Deposition region extends outside simulation box"); } + printf("BOUNDX %g %g: %g %g\n",xlo,xhi, + domain->boxlo_bound[0],domain->boxhi_bound[0]); + printf("BOUNDy %g %g: %g %g\n",ylo,yhi, + domain->boxlo_bound[1],domain->boxhi_bound[1]); + printf("BOUNDz %g %g: %g %g\n",zlo,zhi, + domain->boxlo_bound[2],domain->boxhi_bound[2]); + // error check and further setup for mode = MOLECULE if (atom->tag_enable == 0) @@ -473,6 +480,10 @@ void FixDeposit::pre_exchange() } } + printf("INSERT %ld: %g %g %g: %g %g %g: %d\n",update->ntimestep, + coords[0][0],coords[0][1],coords[0][2], + newcoord[0],newcoord[1],newcoord[2],flag); + if (flag) { if (mode == ATOM) atom->avec->create_atom(ntype,coords[m]); else atom->avec->create_atom(ntype+onemols[imol]->type[m],coords[m]);