removed dead code and reduce compiler warnings about unused parameters (b417cfda) · Commits · 郑智淋 / lammps

src/BODY/fix_wall_body_polygon.cpp

+5 −7

Original line number	Diff line number	Diff line
		@@ -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;

src/BODY/fix_wall_body_polyhedron.cpp

+7 −12

Original line number	Diff line number	Diff line
		@@ -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;
		}

src/GPU/pair_born_coul_long_cs_gpu.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

src/GPU/pair_born_coul_long_gpu.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

src/GPU/pair_born_coul_wolf_cs_gpu.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message