ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dead code removal

Browse Source
This commit is contained in:
Axel Kohlmeyer
2016-10-19 10:42:02 -04:00
parent 566effc9c9
commit 2634468676
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compute_bond_local.cpp
View File

@ -148,7 +148,7 @@ int ComputeBondLocal::compute_bonds(int flag)
double vvib,vrotsq; double vvib,vrotsq;
double inertia,omegasq; double inertia,omegasq;
double mvv2e; double mvv2e;
double engpot,engtrans,engvib,engrot,engtot,fbond; double engpot,engtrans,engvib,engrot,fbond;
double *ptr; double *ptr;
double **x = atom->x; double **x = atom->x;

2
src/dump.cpp
View File

@ -874,7 +874,7 @@ void Dump::modify_params(int narg, char **arg)
format_float_user = NULL; format_float_user = NULL;
// pass format none to child classes which may use it // pass format none to child classes which may use it
// not an error if they don't // not an error if they don't
int n = modify_param(narg-iarg,&arg[iarg]); modify_param(narg-iarg,&arg[iarg]);
iarg += 2; iarg += 2;
continue; continue;
} }

2
src/fix_halt.cpp
View File

@ -194,10 +194,8 @@ void FixHalt::post_run()
double FixHalt::bondmax() double FixHalt::bondmax()
{ {
double **x = atom->x; double **x = atom->x;
double **f = atom->f;
int **bondlist = neighbor->bondlist; int **bondlist = neighbor->bondlist;
int nbondlist = neighbor->nbondlist; int nbondlist = neighbor->nbondlist;
int nlocal = atom->nlocal;
int i1,i2; int i1,i2;
double delx,dely,delz,rsq; double delx,dely,delz,rsq;

14
src/neigh_derive.cpp
View File

@ -232,8 +232,8 @@ void Neighbor::skip_from_granular(NeighList *list)
{ {
int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,dnum,dnumbytes; int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,dnum,dnumbytes;
tagint jtag; tagint jtag;
int *neighptr,*jlist,*touchptr,*touchptr_skip; int *neighptr,*jlist,*touchptr;
double *shearptr,*shearptr_skip; double *shearptr;
NeighList *listgranhistory; NeighList *listgranhistory;
int *npartner; int *npartner;
@ -364,8 +364,8 @@ void Neighbor::skip_from_granular_off2on(NeighList *list)
{ {
int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,dnum,dnumbytes; int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,dnum,dnumbytes;
tagint itag,jtag; tagint itag,jtag;
int *neighptr,*jlist,*touchptr,*touchptr_skip; int *neighptr,*jlist,*touchptr;
double *shearptr,*shearptr_skip; double *shearptr;
NeighList *listgranhistory; NeighList *listgranhistory;
int *npartner; int *npartner;
@ -502,8 +502,8 @@ void Neighbor::skip_from_granular_off2on(NeighList *list)
void Neighbor::skip_from_granular_off2on_onesided(NeighList *list) void Neighbor::skip_from_granular_off2on_onesided(NeighList *list)
{ {
int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,flip,dnum,dnumbytes,tmp; int i,j,ii,jj,m,n,nn,itype,jnum,joriginal,flip,dnum,dnumbytes,tmp;
tagint itag,jtag; tagint jtag;
int *surf,*neighptr,*jlist; int *surf,*jlist;
NeighList *listgranhistory; NeighList *listgranhistory;
int *npartner; int *npartner;
@ -571,7 +571,6 @@ void Neighbor::skip_from_granular_off2on_onesided(NeighList *list)
i = ilist_skip[ii]; i = ilist_skip[ii];
itype = type[i]; itype = type[i];
if (iskip[itype]) continue; if (iskip[itype]) continue;
itag = tag[i];
n = 0; n = 0;
@ -625,7 +624,6 @@ void Neighbor::skip_from_granular_off2on_onesided(NeighList *list)
i = ilist_skip[ii]; i = ilist_skip[ii];
itype = type[i]; itype = type[i];
if (iskip[itype]) continue; if (iskip[itype]) continue;
itag = tag[i];
// loop over parent non-skip granular list and optionally its history info // loop over parent non-skip granular list and optionally its history info

1
src/region.cpp
View File

@ -517,7 +517,6 @@ void Region::set_velocity()
void Region::velocity_contact(double *vwall, double *x, int ic) void Region::velocity_contact(double *vwall, double *x, int ic)
{ {
Contact c = contact[ic];
double xc[3]; double xc[3];
vwall[0] = vwall[1] = vwall[2] = 0.0; vwall[0] = vwall[1] = vwall[2] = 0.0;