diff --git a/src/ASPHERE/compute_temp_asphere.cpp b/src/ASPHERE/compute_temp_asphere.cpp index c79fa3cf84..8f4af98aba 100755 --- a/src/ASPHERE/compute_temp_asphere.cpp +++ b/src/ASPHERE/compute_temp_asphere.cpp @@ -166,7 +166,6 @@ double ComputeTempAsphere::compute_scalar() double **quat = atom->quat; double **angmom = atom->angmom; double *mass = atom->mass; - double **shape = atom->shape; int *type = atom->type; int *mask = atom->mask; int nlocal = atom->nlocal; diff --git a/src/COLLOID/pair_colloid.cpp b/src/COLLOID/pair_colloid.cpp index 6d83e3bd07..ef9e8aa83b 100644 --- a/src/COLLOID/pair_colloid.cpp +++ b/src/COLLOID/pair_colloid.cpp @@ -471,6 +471,7 @@ double PairColloid::single(int i, int j, int itype, int jtype, double rsq, c2 = a2[itype][jtype]; K[1] = c2*c2; K[2] = rsq; + K[0] = K[1] - rsq; K[4] = rsq*rsq; K[3] = K[1] - K[2]; K[3] *= K[3]*K[3]; diff --git a/src/MOLECULE/angle_table.cpp b/src/MOLECULE/angle_table.cpp index aab49790c8..1e6a5fcdfe 100644 --- a/src/MOLECULE/angle_table.cpp +++ b/src/MOLECULE/angle_table.cpp @@ -64,10 +64,10 @@ AngleTable::~AngleTable() void AngleTable::compute(int eflag, int vflag) { - int i1,i2,i3,n,type,factor; + int i1,i2,i3,n,type; double eangle,f1[3],f3[3]; double delx1,dely1,delz1,delx2,dely2,delz2; - double rsq1,rsq2,r1,r2,c,s,a,a11,a12,a22,vx1,vx2,vy1,vy2,vz1,vz2; + double rsq1,rsq2,r1,r2,c,s,a,a11,a12,a22; double theta,u,mdu; //mdu: minus du, -du/dx=f eangle = 0.0; @@ -620,7 +620,7 @@ double AngleTable::splint(double *xa, double *ya, double *y2a, int n, double x) void AngleTable::uf_lookup(int type, double x, double &u, double &f) { int itable; - double fraction,value,a,b; + double fraction,a,b; Table *tb = &tables[tabindex[type]]; @@ -651,7 +651,7 @@ void AngleTable::uf_lookup(int type, double x, double &u, double &f) void AngleTable::u_lookup(int type, double x, double &u) { int itable; - double fraction,value,a,b; + double fraction,a,b; Table *tb = &tables[tabindex[type]]; diff --git a/src/MOLECULE/bond_table.cpp b/src/MOLECULE/bond_table.cpp index 8d0a7a11dd..7ffce66f1f 100644 --- a/src/MOLECULE/bond_table.cpp +++ b/src/MOLECULE/bond_table.cpp @@ -544,7 +544,7 @@ double BondTable::splint(double *xa, double *ya, double *y2a, int n, double x) void BondTable::uf_lookup(int type, double x, double &u, double &f) { int itable; - double fraction,value,a,b; + double fraction,a,b; Table *tb = &tables[tabindex[type]]; x = MAX(x,tb->lo); @@ -578,7 +578,7 @@ void BondTable::uf_lookup(int type, double x, double &u, double &f) void BondTable::u_lookup(int type, double x, double &u) { int itable; - double fraction,value,a,b; + double fraction,a,b; Table *tb = &tables[tabindex[type]]; x = MAX(x,tb->lo); diff --git a/src/PRD/prd.cpp b/src/PRD/prd.cpp index 29cec75100..d9e19571fb 100644 --- a/src/PRD/prd.cpp +++ b/src/PRD/prd.cpp @@ -59,7 +59,7 @@ PRD::PRD(LAMMPS *lmp) : Pointers(lmp) {} void PRD::command(int narg, char **arg) { - int i,flag,allflag,ireplica; + int flag,ireplica; // error checks