remove dead code in various neighbor list related source files

This commit is contained in:
Axel Kohlmeyer
2018-02-08 13:07:56 -05:00
parent 49745968f2
commit 21fe88ffa8
13 changed files with 13 additions and 29 deletions

View File

@ -529,7 +529,7 @@ while (ct-- > 0) {
void FixShardlow::initial_integrate(int vflag) void FixShardlow::initial_integrate(int vflag)
{ {
int i,ii,inum; int ii;
int *ilist; int *ilist;
int nlocal = atom->nlocal; int nlocal = atom->nlocal;
@ -592,9 +592,7 @@ void FixShardlow::initial_integrate(int vflag)
// Allocate memory for v_t0 to hold the initial velocities for the ghosts // Allocate memory for v_t0 to hold the initial velocities for the ghosts
v_t0 = (double (*)[3]) memory->smalloc(sizeof(double)*3*nghost, "FixShardlow:v_t0"); v_t0 = (double (*)[3]) memory->smalloc(sizeof(double)*3*nghost, "FixShardlow:v_t0");
inum = list->inum;
ilist = list->ilist; ilist = list->ilist;
dtsqrt = sqrt(update->dt); dtsqrt = sqrt(update->dt);
// process neighbors in the local AIR // process neighbors in the local AIR

View File

@ -85,8 +85,6 @@ void NPairHalfBinNewtonSSA::build(NeighList *list)
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;
tagint **special = atom->special; tagint **special = atom->special;
int **nspecial = atom->nspecial; int **nspecial = atom->nspecial;
int nlocal = atom->nlocal;
if (includegroup) nlocal = atom->nfirst;
int *molindex = atom->molindex; int *molindex = atom->molindex;
int *molatom = atom->molatom; int *molatom = atom->molatom;
@ -168,7 +166,7 @@ void NPairHalfBinNewtonSSA::build(NeighList *list)
for (int subphase = 0; subphase < 4; subphase++) { for (int subphase = 0; subphase < 4; subphase++) {
int s_ybin = ybin + ((subphase & 0x2) ? ns_ssa->sy : 0); int s_ybin = ybin + ((subphase & 0x2) ? ns_ssa->sy : 0);
int s_xbin = xbin + ((subphase & 0x1) ? ns_ssa->sx : 0); int s_xbin = xbin + ((subphase & 0x1) ? ns_ssa->sx : 0);
int ibin, ct; int ibin;
if ((s_ybin < lbinylo) || (s_ybin >= lbinyhi)) continue; if ((s_ybin < lbinylo) || (s_ybin >= lbinyhi)) continue;
if ((s_xbin < lbinxlo) || (s_xbin >= lbinxhi)) continue; if ((s_xbin < lbinxlo) || (s_xbin >= lbinxhi)) continue;

View File

@ -48,14 +48,13 @@ void NPairHalfSizeBinNewtonOmp::build(NeighList *list)
#endif #endif
NPAIR_OMP_SETUP(nlocal); NPAIR_OMP_SETUP(nlocal);
int i,j,k,m,n,nn,ibin; int i,j,k,n,ibin;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;
double **x = atom->x; double **x = atom->x;
double *radius = atom->radius; double *radius = atom->radius;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int *mask = atom->mask; int *mask = atom->mask;
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;

View File

@ -51,14 +51,13 @@ void NPairHalfSizeNsqNewtoffOmp::build(NeighList *list)
#endif #endif
NPAIR_OMP_SETUP(nlocal); NPAIR_OMP_SETUP(nlocal);
int i,j,m,n,nn; int i,j,n;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;
double **x = atom->x; double **x = atom->x;
double *radius = atom->radius; double *radius = atom->radius;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int *mask = atom->mask; int *mask = atom->mask;
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;

View File

@ -52,7 +52,7 @@ void NPairHalfSizeNsqNewtonOmp::build(NeighList *list)
#endif #endif
NPAIR_OMP_SETUP(nlocal); NPAIR_OMP_SETUP(nlocal);
int i,j,m,n,nn,itag,jtag; int i,j,n,itag,jtag;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;

View File

@ -36,14 +36,13 @@ NPairHalfSizeBinNewtoff::NPairHalfSizeBinNewtoff(LAMMPS *lmp) : NPair(lmp) {}
void NPairHalfSizeBinNewtoff::build(NeighList *list) void NPairHalfSizeBinNewtoff::build(NeighList *list)
{ {
int i,j,k,m,n,nn,ibin; int i,j,k,n,ibin;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;
double **x = atom->x; double **x = atom->x;
double *radius = atom->radius; double *radius = atom->radius;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int *mask = atom->mask; int *mask = atom->mask;
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;

View File

@ -35,14 +35,13 @@ NPairHalfSizeBinNewton::NPairHalfSizeBinNewton(LAMMPS *lmp) : NPair(lmp) {}
void NPairHalfSizeBinNewton::build(NeighList *list) void NPairHalfSizeBinNewton::build(NeighList *list)
{ {
int i,j,k,m,n,nn,ibin; int i,j,k,n,ibin;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;
double **x = atom->x; double **x = atom->x;
double *radius = atom->radius; double *radius = atom->radius;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int *mask = atom->mask; int *mask = atom->mask;
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;

View File

@ -36,14 +36,13 @@ NPairHalfSizeBinNewtonTri::NPairHalfSizeBinNewtonTri(LAMMPS *lmp) :
void NPairHalfSizeBinNewtonTri::build(NeighList *list) void NPairHalfSizeBinNewtonTri::build(NeighList *list)
{ {
int i,j,k,m,n,nn,ibin; int i,j,k,n,ibin;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;
double **x = atom->x; double **x = atom->x;
double *radius = atom->radius; double *radius = atom->radius;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int *mask = atom->mask; int *mask = atom->mask;
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;

View File

@ -36,14 +36,13 @@ NPairHalfSizeNsqNewtoff::NPairHalfSizeNsqNewtoff(LAMMPS *lmp) : NPair(lmp) {}
void NPairHalfSizeNsqNewtoff::build(NeighList *list) void NPairHalfSizeNsqNewtoff::build(NeighList *list)
{ {
int i,j,m,n,nn,bitmask; int i,j,n,bitmask;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;
double **x = atom->x; double **x = atom->x;
double *radius = atom->radius; double *radius = atom->radius;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int *mask = atom->mask; int *mask = atom->mask;
tagint *molecule = atom->molecule; tagint *molecule = atom->molecule;

View File

@ -37,7 +37,7 @@ NPairHalfSizeNsqNewton::NPairHalfSizeNsqNewton(LAMMPS *lmp) : NPair(lmp) {}
void NPairHalfSizeNsqNewton::build(NeighList *list) void NPairHalfSizeNsqNewton::build(NeighList *list)
{ {
int i,j,m,n,nn,itag,jtag,bitmask; int i,j,n,itag,jtag,bitmask;
double xtmp,ytmp,ztmp,delx,dely,delz,rsq; double xtmp,ytmp,ztmp,delx,dely,delz,rsq;
double radi,radsum,cutsq; double radi,radsum,cutsq;
int *neighptr; int *neighptr;

View File

@ -33,14 +33,10 @@ NPairSkipSize::NPairSkipSize(LAMMPS *lmp) : NPair(lmp) {}
void NPairSkipSize::build(NeighList *list) void NPairSkipSize::build(NeighList *list)
{ {
int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,dnum,dnumbytes; int i,j,ii,jj,n,itype,jnum,joriginal;
tagint jtag;
int *neighptr,*jlist; int *neighptr,*jlist;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int nlocal = atom->nlocal;
int *ilist = list->ilist; int *ilist = list->ilist;
int *numneigh = list->numneigh; int *numneigh = list->numneigh;
int **firstneigh = list->firstneigh; int **firstneigh = list->firstneigh;

View File

@ -34,7 +34,7 @@ NPairSkipSizeOff2on::NPairSkipSizeOff2on(LAMMPS *lmp) : NPair(lmp) {}
void NPairSkipSizeOff2on::build(NeighList *list) void NPairSkipSizeOff2on::build(NeighList *list)
{ {
int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,dnum,dnumbytes; int i,j,ii,jj,n,itype,jnum,joriginal;
tagint itag,jtag; tagint itag,jtag;
int *neighptr,*jlist; int *neighptr,*jlist;

View File

@ -37,11 +37,9 @@ NPairSkipSizeOff2onOneside::NPairSkipSizeOff2onOneside(LAMMPS *lmp) :
void NPairSkipSizeOff2onOneside::build(NeighList *list) void NPairSkipSizeOff2onOneside::build(NeighList *list)
{ {
int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,flip,dnum,dnumbytes,tmp; int i,j,ii,jj,n,itype,jnum,joriginal,flip,tmp;
tagint jtag;
int *surf,*jlist; int *surf,*jlist;
tagint *tag = atom->tag;
int *type = atom->type; int *type = atom->type;
int nlocal = atom->nlocal; int nlocal = atom->nlocal;