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

removed dead code and reduce compiler warnings about unused parameters

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-02-03 11:36:41 -05:00
parent d6eaf73db1
commit b417cfda9b
36 changed files with 83 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BODY/fix_wall_body_polygon.cpp
View File

@ -206,7 +206,7 @@ void FixWallBodyPolygon::setup(int vflag)
void FixWallBodyPolygon::post_force(int /*vflag*/)
{
double vwall[3],dx,dy,dz,del1,del2,delxy,delr,rsq,eradi,rradi,wall_pos;
double vwall[3],dx,dy,dz,del1,del2,delxy,delr,rsq,eradi,wall_pos;
int i,ni,npi,ifirst,nei,iefirst,side;
double facc[3];
@ -316,7 +316,6 @@ void FixWallBodyPolygon::post_force(int /*vflag*/)
nei = ednum[i];
iefirst = edfirst[i];
eradi = enclosing_radius[i];
rradi = rounded_radius[i];
// reset vertex and edge forces
@ -332,13 +331,13 @@ void FixWallBodyPolygon::post_force(int /*vflag*/)
edge[iefirst+ni][4] = 0;
}
int interact, num_contacts, done;
int num_contacts, done;
double delta_a, delta_ua, j_a;
Contact contact_list[MAX_CONTACTS];
num_contacts = 0;
facc[0] = facc[1] = facc[2] = 0;
interact = vertex_against_wall(i, wall_pos, x, f, torque, side,
vertex_against_wall(i, wall_pos, x, f, torque, side,
contact_list, num_contacts, facc);
if (num_contacts >= 2) {
@ -475,12 +474,11 @@ int FixWallBodyPolygon::vertex_against_wall(int i, double wall_pos,
Contact* contact_list, int &num_contacts, double* /*facc*/)
{
int ni, npi, ifirst, interact;
double xpi[3], eradi, rradi;
double xpi[3], rradi;
double fx, fy, fz;
npi = dnum[i];
ifirst = dfirst[i];
eradi = enclosing_radius[i];
rradi = rounded_radius[i];
interact = 0;

17
src/BODY/fix_wall_body_polyhedron.cpp
View File

@ -213,8 +213,8 @@ void FixWallBodyPolyhedron::setup(int vflag)
void FixWallBodyPolyhedron::post_force(int /*vflag*/)
{
double vwall[3],dx,dy,dz,del1,del2,rsq,eradi,rradi,wall_pos;
int i,ni,npi,ifirst,nei,iefirst,nfi,iffirst,side;
double vwall[3],dx,dy,dz,del1,del2,rsq,wall_pos;
int i,ni,npi,ifirst,nei,iefirst,side;
double facc[3];
// set position of wall to initial settings and velocity to 0.0
@ -330,10 +330,6 @@ void FixWallBodyPolyhedron::post_force(int /*vflag*/)
ifirst = dfirst[i];
nei = ednum[i];
iefirst = edfirst[i];
nfi = facnum[i];
iffirst = facfirst[i];
eradi = enclosing_radius[i];
rradi = rounded_radius[i];
if (npi == 1) {
sphere_against_wall(i, wall_pos, side, vwall, x, v, f, angmom, torque);
@ -356,12 +352,12 @@ void FixWallBodyPolyhedron::post_force(int /*vflag*/)
edge[iefirst+ni][5] = 0;
}
int interact, num_contacts;
int num_contacts;
Contact contact_list[MAX_CONTACTS];
num_contacts = 0;
facc[0] = facc[1] = facc[2] = 0;
interact = edge_against_wall(i, wall_pos, side, vwall, x, f, torque,
edge_against_wall(i, wall_pos, side, vwall, x, f, torque,
contact_list, num_contacts, facc);
} // group bit
@ -544,7 +540,7 @@ int FixWallBodyPolyhedron::edge_against_wall(int i, double wall_pos,
int side, double* vwall, double** x, double** /*f*/, double** /*torque*/,
Contact* /*contact_list*/, int &/*num_contacts*/, double* /*facc*/)
{
int ni, nei, mode, contact;
int ni, nei, contact;
double rradi;
nei = ednum[i];
@ -555,8 +551,7 @@ int FixWallBodyPolyhedron::edge_against_wall(int i, double wall_pos,
// loop through body i's edges
for (ni = 0; ni < nei; ni++)
mode = compute_distance_to_wall(i, ni, x[i], rradi, wall_pos, side, vwall,
contact);
compute_distance_to_wall(i, ni, x[i], rradi, wall_pos, side, vwall, contact);
return contact;
}

4
src/GPU/pair_born_coul_long_cs_gpu.cpp
View File

@ -212,8 +212,8 @@ double PairBornCoulLongCSGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairBornCoulLongCSGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itable,itype,jtype;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;

4
src/GPU/pair_born_coul_long_gpu.cpp
View File

@ -207,8 +207,8 @@ double PairBornCoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairBornCoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;

6
src/GPU/pair_born_coul_wolf_cs_gpu.cpp
View File

@ -193,9 +193,9 @@ double PairBornCoulWolfCSGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairBornCoulWolfCSGPU::cpu_compute(int start, int inum, int eflag, int vflag,
int *ilist, int *numneigh,
int **firstneigh) {
void PairBornCoulWolfCSGPU::cpu_compute(int start, int inum, int eflag,
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,qtmp,delx,dely,delz,evdwl,ecoul,fpair;
double rsq,r2inv,r6inv,forcecoul,forceborn,factor_coul,factor_lj;

4
src/GPU/pair_buck_coul_long_gpu.cpp
View File

@ -201,8 +201,8 @@ double PairBuckCoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairBuckCoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;

5
src/GPU/pair_colloid_gpu.cpp
View File

@ -184,8 +184,9 @@ double PairColloidGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairColloidGPU::cpu_compute(int start, int inum, int eflag, int vflag,
int *ilist, int *numneigh, int **firstneigh)
void PairColloidGPU::cpu_compute(int start, int inum, int eflag,
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

6
src/GPU/pair_coul_long_cs_gpu.cpp
View File

@ -153,7 +153,7 @@ void PairCoulLongCSGPU::init_style()
for (int i = 1; i <= atom->ntypes; i++) {
for (int j = i; j <= atom->ntypes; j++) {
if (setflag[i][j] != 0 || (setflag[i][i] != 0 && setflag[j][j] != 0)) {
double cut = init_one(i,j);
init_one(i,j);
}
}
}
@ -208,8 +208,8 @@ double PairCoulLongCSGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairCoulLongCSGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itable,itype,jtype;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,ecoul,fpair;

6
src/GPU/pair_coul_long_gpu.cpp
View File

@ -148,7 +148,7 @@ void PairCoulLongGPU::init_style()
for (int i = 1; i <= atom->ntypes; i++) {
for (int j = i; j <= atom->ntypes; j++) {
if (setflag[i][j] != 0 || (setflag[i][i] != 0 && setflag[j][j] != 0)) {
double cut = init_one(i,j);
init_one(i,j);
}
}
}
@ -203,8 +203,8 @@ double PairCoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairCoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itable;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,ecoul,fpair;

6
src/GPU/pair_eam_alloy_gpu.cpp
View File

@ -192,8 +192,8 @@ void PairEAMAlloyGPU::init_style()
/* ---------------------------------------------------------------------- */
double PairEAMAlloyGPU::single(int i, int j, int itype, int jtype,
double rsq, double factor_coul, double factor_lj,
double &fforce)
double rsq, double /* factor_coul */,
double /* factor_lj */, double &fforce)
{
int m;
double r,p,rhoip,rhojp,z2,z2p,recip,phi,phip,psip;
@ -235,7 +235,7 @@ double PairEAMAlloyGPU::single(int i, int j, int itype, int jtype,
/* ---------------------------------------------------------------------- */
int PairEAMAlloyGPU::pack_forward_comm(int n, int *list, double *buf,
int pbc_flag,int *pbc)
int /* pbc_flag */, int * /* pbc */)
{
int i,j,m;

6
src/GPU/pair_eam_fs_gpu.cpp
View File

@ -192,8 +192,8 @@ void PairEAMFSGPU::init_style()
/* ---------------------------------------------------------------------- */
double PairEAMFSGPU::single(int i, int j, int itype, int jtype,
double rsq, double factor_coul, double factor_lj,
double &fforce)
double rsq, double /* factor_coul */,
double /* factor_lj */, double &fforce)
{
int m;
double r,p,rhoip,rhojp,z2,z2p,recip,phi,phip,psip;
@ -235,7 +235,7 @@ double PairEAMFSGPU::single(int i, int j, int itype, int jtype,
/* ---------------------------------------------------------------------- */
int PairEAMFSGPU::pack_forward_comm(int n, int *list, double *buf,
int pbc_flag,int *pbc)
int /* pbc_flag */, int * /* pbc */)
{
int i,j,m;

6
src/GPU/pair_eam_gpu.cpp
View File

@ -195,8 +195,8 @@ void PairEAMGPU::init_style()
/* ---------------------------------------------------------------------- */
double PairEAMGPU::single(int i, int j, int itype, int jtype,
double rsq, double factor_coul, double factor_lj,
double &fforce)
double rsq, double /* factor_coul */,
double /* factor_lj */, double &fforce)
{
int m;
double r,p,rhoip,rhojp,z2,z2p,recip,phi,phip,psip;
@ -238,7 +238,7 @@ double PairEAMGPU::single(int i, int j, int itype, int jtype,
/* ---------------------------------------------------------------------- */
int PairEAMGPU::pack_forward_comm(int n, int *list, double *buf,
int pbc_flag,int *pbc)
int /* pbc_flag */, int * /* pbc */)
{
int i,j,m;

5
src/GPU/pair_gayberne_gpu.cpp
View File

@ -221,8 +221,9 @@ double PairGayBerneGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairGayBerneGPU::cpu_compute(int start, int inum, int eflag, int vflag,
int *ilist, int *numneigh, int **firstneigh)
void PairGayBerneGPU::cpu_compute(int start, int inum, int eflag,
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;
double evdwl,one_eng,rsq,r2inv,r6inv,forcelj,factor_lj;

5
src/GPU/pair_lj_charmm_coul_long_gpu.cpp
View File

@ -151,11 +151,10 @@ void PairLJCharmmCoulLongGPU::init_style()
// Repeat cutsq calculation because done after call to init_style
double cut;
for (int i = 1; i <= atom->ntypes; i++) {
for (int j = i; j <= atom->ntypes; j++) {
if (setflag[i][j] != 0 || (setflag[i][i] != 0 && setflag[j][j] != 0))
cut = init_one(i,j);
init_one(i,j);
}
}
@ -219,7 +218,7 @@ double PairLJCharmmCoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairLJCharmmCoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist,
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype,itable;

4
src/GPU/pair_lj_class2_coul_long_gpu.cpp
View File

@ -197,8 +197,8 @@ double PairLJClass2CoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairLJClass2CoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;

4
src/GPU/pair_lj_cut_coul_long_gpu.cpp
View File

@ -215,8 +215,8 @@ double PairLJCutCoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairLJCutCoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype,itable;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;

5
src/GPU/pair_lj_cut_coul_msm_gpu.cpp
View File

@ -192,8 +192,9 @@ double PairLJCutCoulMSMGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairLJCutCoulMSMGPU::cpu_compute(int start, int inum, int eflag, int vflag,
int *ilist, int *numneigh, int **firstneigh) {
void PairLJCutCoulMSMGPU::cpu_compute(int start, int inum, int eflag,
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype,itable;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;
double fraction,table;

7
src/GPU/pair_lj_cut_dipole_long_gpu.cpp
View File

@ -216,7 +216,7 @@ void PairLJCutDipoleLongGPU::cpu_compute(int start, int inum, int eflag, int vfl
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz;
double rsq,r,rinv,r2inv,r6inv;
double forcecoulx,forcecouly,forcecoulz,fforce;
double tixcoul,tiycoul,tizcoul,tjxcoul,tjycoul,tjzcoul;
double tixcoul,tiycoul,tizcoul;
double fx,fy,fz,fdx,fdy,fdz,fax,fay,faz;
double pdotp,pidotr,pjdotr,pre1,pre2,pre3;
double grij,expm2,t,erfc;
@ -378,14 +378,9 @@ void PairLJCutDipoleLongGPU::cpu_compute(int start, int inum, int eflag, int vfl
tixcoul = mu[i][1]*(zdiz + zaiz) - mu[i][2]*(zdiy + zaiy);
tiycoul = mu[i][2]*(zdix + zaix) - mu[i][0]*(zdiz + zaiz);
tizcoul = mu[i][0]*(zdiy + zaiy) - mu[i][1]*(zdix + zaix);
tjxcoul = mu[j][1]*(zdjz + zajz) - mu[j][2]*(zdjy + zajy);
tjycoul = mu[j][2]*(zdjx + zajx) - mu[j][0]*(zdjz + zajz);
tjzcoul = mu[j][0]*(zdjy + zajy) - mu[j][1]*(zdjx + zajx);
} else {
forcecoulx = forcecouly = forcecoulz = 0.0;
tixcoul = tiycoul = tizcoul = 0.0;
tjxcoul = tjycoul = tjzcoul = 0.0;
}
// LJ interaction

4
src/GPU/pair_lj_expand_coul_long_gpu.cpp
View File

@ -215,8 +215,8 @@ double PairLJExpandCoulLongGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairLJExpandCoulLongGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh)
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype,itable;
double qtmp,xtmp,ytmp,ztmp,delx,dely,delz,evdwl,ecoul,fpair;

2
src/GPU/pair_mie_cut_gpu.cpp
View File

@ -172,7 +172,7 @@ double PairMIECutGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairMIECutGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairMIECutGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

2
src/GPU/pair_morse_gpu.cpp
View File

@ -168,7 +168,7 @@ double PairMorseGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairMorseGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairMorseGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;

5
src/GPU/pair_resquared_gpu.cpp
View File

@ -219,8 +219,9 @@ double PairRESquaredGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairRESquaredGPU::cpu_compute(int start, int inum, int eflag, int vflag,
int *ilist, int *numneigh, int **firstneigh)
void PairRESquaredGPU::cpu_compute(int start, int inum, int eflag,
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh)
{
int i,j,ii,jj,jnum,itype,jtype;
double evdwl,one_eng,rsq,r2inv,r6inv,forcelj,factor_lj;

2
src/GPU/pair_soft_gpu.cpp
View File

@ -182,7 +182,7 @@ double PairSoftGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairSoftGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairSoftGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

2
src/GPU/pair_table_gpu.cpp
View File

@ -246,7 +246,7 @@ double PairTableGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairTableGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairTableGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype,itable;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

2
src/GPU/pair_ufm_gpu.cpp
View File

@ -186,7 +186,7 @@ double PairUFMGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairUFMGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairUFMGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

2
src/GPU/pair_vashishta_gpu.cpp
View File

@ -151,7 +151,7 @@ void PairVashishtaGPU::init_style()
if (force->newton_pair != 0)
error->all(FLERR,"Pair style vashishta/gpu requires newton pair off");
double *cutsq, *r0, *r0eps, *gamma, *eta;
double *cutsq, *r0, *gamma, *eta;
double *lam1inv, *lam4inv, *zizj, *mbigd;
double *dvrc, *big6w, *heta, *bigh;
double *bigw, *c0, *costheta, *bigb;

4
src/GPU/pair_yukawa_colloid_gpu.cpp
View File

@ -179,8 +179,8 @@ double PairYukawaColloidGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairYukawaColloidGPU::cpu_compute(int start, int inum, int eflag,
int vflag, int *ilist, int *numneigh,
int **firstneigh) {
int /* vflag */, int *ilist,
int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair,radi,radj;
double r,rsq,rinv,screening,forceyukawa,factor;

2
src/GPU/pair_yukawa_gpu.cpp
View File

@ -170,7 +170,7 @@ double PairYukawaGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairYukawaGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairYukawaGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

2
src/GPU/pair_zbl_gpu.cpp
View File

@ -177,7 +177,7 @@ double PairZBLGPU::memory_usage()
/* ---------------------------------------------------------------------- */
void PairZBLGPU::cpu_compute(int start, int inum, int eflag, int vflag,
void PairZBLGPU::cpu_compute(int start, int inum, int eflag, int /* vflag */,
int *ilist, int *numneigh, int **firstneigh) {
int i,j,ii,jj,jnum,itype,jtype;
double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair;

4
src/MANYBODY/pair_bop.cpp
View File

@ -4988,7 +4988,7 @@ void PairBOP::read_table(char *filename)
fgets(s,MAXLINE,fp);
nws=0;
ws=1;
for(j=0;j<strlen(s);j++) {
for(j=0;j<(int)strlen(s);j++) {
if(ws==1) {
if(isspace(s[j])) {
ws=1;
@ -5015,7 +5015,7 @@ void PairBOP::read_table(char *filename)
nws=0;
ws=1;
fgets(s,MAXLINE,fp);
for(j=0;j<strlen(s);j++) {
for(j=0;j<(int)strlen(s);j++) {
if(ws==1) {
if(isspace(s[j])) {
ws=1;

6
src/PYTHON/pair_python.cpp
View File

@ -401,9 +401,9 @@ double PairPython::init_one(int, int)
/* ---------------------------------------------------------------------- */
double PairPython::single(int i, int j, int itype, int jtype, double rsq,
double factor_coul, double factor_lj,
double &fforce)
double PairPython::single(int /* i */, int /* j */, int itype, int jtype,
double rsq, double /* factor_coul */,
double factor_lj, double &fforce)
{
// with hybrid/overlay we might get called for skipped types
if (skip_types[itype] || skip_types[jtype]) {

2
src/atom.cpp
View File

@ -2290,7 +2290,7 @@ int Atom::memcheck(const char *str)
return 0;
}
if (strlen(memstr) + n >= memlength) {
if ((int)strlen(memstr) + n >= memlength) {
memlength += DELTA_MEMSTR;
memory->grow(memstr,memlength,"atom:memstr");
}

1
src/compute_reduce_region.cpp
View File

@ -78,7 +78,6 @@ double ComputeReduceRegion::compute_one(int m, int flag)
n = value2index[m];
}
int aidx = argindex[m];
int j = argindex[m];
double one = 0.0;

8
src/pair.cpp
View File

@ -151,13 +151,13 @@ void Pair::modify_params(int narg, char **arg)
} else if (strcmp(arg[iarg],"table") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal pair_modify command");
ncoultablebits = force->inumeric(FLERR,arg[iarg+1]);
if (ncoultablebits > sizeof(float)*CHAR_BIT)
if (ncoultablebits > (int)sizeof(float)*CHAR_BIT)
error->all(FLERR,"Too many total bits for bitmapped lookup table");
iarg += 2;
} else if (strcmp(arg[iarg],"table/disp") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal pair_modify command");
ndisptablebits = force->inumeric(FLERR,arg[iarg+1]);
if (ndisptablebits > sizeof(float)*CHAR_BIT)
if (ndisptablebits > (int)sizeof(float)*CHAR_BIT)
error->all(FLERR,"Too many total bits for bitmapped lookup table");
iarg += 2;
} else if (strcmp(arg[iarg],"tabinner") == 0) {
@ -1695,7 +1695,7 @@ void Pair::init_bitmap(double inner, double outer, int ntablebits,
if (sizeof(int) != sizeof(float))
error->all(FLERR,"Bitmapped lookup tables require int/float be same size");
if (ntablebits > sizeof(float)*CHAR_BIT)
if (ntablebits > (int)sizeof(float)*CHAR_BIT)
error->all(FLERR,"Too many total bits for bitmapped lookup table");
if (inner >= outer)
@ -1719,7 +1719,7 @@ void Pair::init_bitmap(double inner, double outer, int ntablebits,
int nmantbits = ntablebits - nexpbits;
if (nexpbits > sizeof(float)*CHAR_BIT - FLT_MANT_DIG)
if (nexpbits > (int)sizeof(float)*CHAR_BIT - FLT_MANT_DIG)
error->all(FLERR,"Too many exponent bits for lookup table");
if (nmantbits+1 > FLT_MANT_DIG)
error->all(FLERR,"Too many mantissa bits for lookup table");

2
src/read_data.cpp
View File

@ -1963,7 +1963,7 @@ void ReadData::parse_keyword(int first)
}
while (eof == 0 && done == 0) {
int blank = strspn(line," \t\n\r");
if ((blank == strlen(line)) || (line[blank] == '#')) {
if ((blank == (int)strlen(line)) || (line[blank] == '#')) {
if (fgets(line,MAXLINE,fp) == NULL) eof = 1;
} else done = 1;
}

2
src/read_restart.cpp
View File

@ -627,7 +627,7 @@ void ReadRestart::file_search(char *infile, char *outfile)
if ((ptr = strstr(&ep->d_name[nbegin],end)) == NULL) continue;
if (strlen(end) == 0) ptr = ep->d_name + strlen(ep->d_name);
*ptr = '\0';
if (strlen(&ep->d_name[nbegin]) < n) {
if ((int)strlen(&ep->d_name[nbegin]) < n) {
strcpy(middle,&ep->d_name[nbegin]);
if (ATOBIGINT(middle) > maxnum) maxnum = ATOBIGINT(middle);
}