Unverified Commit ed208fa4 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

reduce some more compiler warnings

parent 4e5520ce
Loading
Loading
Loading
Loading
+1 −1
Changes for src/USER-DPD/pair_dpd_fdt.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ void PairDPDfdt::init_style()
    error->all(FLERR,"Pair dpd/fdt requires ghost atoms store velocity");

  splitFDT_flag = false;
  int irequest = neighbor->request(this,instance_me);
  neighbor->request(this,instance_me);
  for (int i = 0; i < modify->nfix; i++)
    if (strncmp(modify->fix[i]->style,"shardlow", 8) == 0){
      splitFDT_flag = true;
+1 −1
Changes for src/USER-DPD/pair_dpd_fdt_energy.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ void PairDPDfdtEnergy::init_style()
    error->all(FLERR,"Pair dpd/fdt/energy requires ghost atoms store velocity");

  splitFDT_flag = false;
  int irequest = neighbor->request(this,instance_me);
  neighbor->request(this,instance_me);
  for (int i = 0; i < modify->nfix; i++)
    if (strncmp(modify->fix[i]->style,"shardlow", 8) == 0){
      splitFDT_flag = true;
+1 −1
Changes for src/USER-DRUDE/pair_lj_cut_thole_long.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void PairLJCutTholeLong::init_style()
      error->all(FLERR, "Pair style lj/cut/thole/long requires fix drude");
  fix_drude = (FixDrude *) modify->fix[ifix];

  int irequest = neighbor->request(this,instance_me);
  neighbor->request(this,instance_me);

  cut_coulsq = cut_coul * cut_coul;

+1 −2
Changes for src/USER-MISC/pair_kolmogorov_crespi_full.cpp: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ void PairKolmogorovCrespiFull::calc_FRep(int eflag, int /* vflag */)
  int i,j,ii,jj,inum,jnum,itype,jtype,k,kk;
  double prodnorm1,fkcx,fkcy,fkcz;
  double xtmp,ytmp,ztmp,delx,dely,delz,evdwl,fpair,fpair1;
  double rsq,r,rhosq1,exp0,exp1,r2inv,r6inv,Tap,dTap,Vkc;
  double rsq,r,rhosq1,exp0,exp1,r2inv,Tap,dTap,Vkc;
  double frho_ij,sumC1,sumC11,sumCff,fsum,rho_ij;
  int *ilist,*jlist,*numneigh,**firstneigh;
  int *KC_neighs_i;
@@ -607,7 +607,6 @@ void PairKolmogorovCrespiFull::calc_FRep(int eflag, int /* vflag */)

        r = sqrt(rsq);
        r2inv = 1.0/rsq;
        r6inv = r2inv*r2inv*r2inv;

	// turn on/off taper function
	if (tap_flag) {