remove dead code and avoid compiler warnings (31277349) · Commits · 郑智淋 / lammps

src/USER-SDPD/fix_meso_move.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -397,7 +397,6 @@ void FixMesoMove::initial_integrate (int /vflag/) {
		double *e = atom->e;
		double *de = atom->de;
		double **f = atom->f;
		double **omega = atom->omega;
		double *rmass = atom->rmass;
		double *mass = atom->mass;
		int *type = atom->type;
		@@ -987,7 +986,7 @@ int FixMesoMove::maxsize_restart () {
		size of atom nlocal's restart data
		------------------------------------------------------------------------- */

		int FixMesoMove::size_restart (int nlocal) {
		int FixMesoMove::size_restart (int /* nlocal */) {
		return 4;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -179,8 +179,8 @@ void FixRigidMeso::initial_integrate (int vflag) {
		/* ---------------------------------------------------------------------- */

		void FixRigidMeso::final_integrate () {
		int i,ibody;
		double dtfm,xy,xz,yz;
		int ibody;
		double dtfm;
		double mbody[3],tbody[3],fquat[4];

		double dtf2 = dtf * 2.0;
		@@ -248,7 +248,7 @@ void FixRigidMeso::set_xv () {
		int xbox,ybox,zbox;
		double x0,x1,x2,v0,v1,v2,fc0,fc1,fc2,massone;
		double xy,xz,yz;
		double ione[3],exone[3],eyone[3],ezone[3],vr[6],p[3][3];
		double vr[6];

		double **x = atom->x;
		double **v = atom->v;
		@@ -379,7 +379,7 @@ void FixRigidMeso::set_v () {
		int xbox,ybox,zbox;
		double x0,x1,x2,v0,v1,v2,fc0,fc1,fc2,massone;
		double xy,xz,yz;
		double ione[3],exone[3],eyone[3],ezone[3],delta[3],vr[6];
		double delta[3],vr[6];

		double **x = atom->x;
		double **v = atom->v;

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ class FixRigidMeso : public FixRigid {
		void setup (int);
		void initial_integrate (int);
		void final_integrate ();
		double compute_scalar () {}
		double compute_scalar () { return 0.0; }
		double compute_array (int, int);

		protected:

+1 −2

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ void PairSDPDTaitwaterIsothermal::compute (int eflag, int vflag) {
		int ilist, jlist, numneigh, *firstneigh;
		double vxtmp, vytmp, vztmp, imass, jmass, fi, fj, fvisc;
		double h, ih, ihsq, velx, vely, velz;
		double rsq, tmp, wfd, delVdotDelR, deltaE;
		double rsq, tmp, wfd, delVdotDelR;
		double prefactor, wiener[3][3], f_random[3];

		if (eflag \|\| vflag) ev_setup (eflag, vflag);
		@@ -78,7 +78,6 @@ void PairSDPDTaitwaterIsothermal::compute (int eflag, int vflag) {
		double **f = atom->f;
		double *rho = atom->rho;
		double *mass = atom->mass;
		double *de = atom->de;
		double *drho = atom->drho;
		int *type = atom->type;
		int nlocal = atom->nlocal;