some dead code removal and more whitespace cleanup (8ba1d760) · Commits · 郑智淋 / lammps

src/RIGID/fix_rigid_small.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1629,7 +1629,7 @@ int FixRigidSmall::rendezvous_body(int n, char *inbuf,
		int &rflag, int &proclist, char &outbuf,
		void *ptr)
		{
		int i,j,m;
		int i,m;
		double delx,dely,delz,rsq;
		int *iclose;
		tagint *idclose;

src/RIGID/fix_shake.cpp

+39 −43

Original line number	Diff line number	Diff line
		@@ -694,10 +694,9 @@ int FixShake::dof(int igroup)
		void FixShake::find_clusters()
		{
		int i,j,m,n,imol,iatom;
		int flag,flag_all,nbuf,size;
		int flag,flag_all;
		tagint tagprev;
		double massone;
		tagint *buf;

		if (me == 0 && screen) {
		if (!rattle) fprintf(screen,"Finding SHAKE clusters ...\n");
		@@ -1215,7 +1214,7 @@ void FixShake::partner_info(int npartner, tagint *partner_tag,
		void FixShake::nshake_info(int npartner, tagint *partner_tag,
		int **partner_nshake)
		{
		int i,j,m,n;
		int i,j,m;
		int nlocal = atom->nlocal;

		// nsend = # of my datums to send
		@@ -1294,7 +1293,7 @@ void FixShake::nshake_info(int npartner, tagint *partner_tag,
		void FixShake::shake_info(int npartner, tagint *partner_tag,
		int **partner_shake)
		{
		int i,j,m,n;
		int i,j,m;
		int nlocal = atom->nlocal;

		// nsend = # of my datums to send
		@@ -1458,9 +1457,6 @@ int FixShake::rendezvous_partners_info(int n, char *inbuf,
		int *procowner = fsptr->procowner;
		memory->create(proclist,n,"shake:proclist");

		double massone;
		int nmass = fsptr->nmass;

		for (i = 0; i < n; i++) {
		m = atom->map(in[i].atomID);
		proclist[i] = procowner[m];
		@@ -1490,7 +1486,7 @@ int FixShake::rendezvous_nshake(int n, char *inbuf,
		int &flag, int &proclist, char &outbuf,
		void *ptr)
		{
		int i,j,m;
		int i,m;

		FixShake fsptr = (FixShake ) ptr;
		Atom *atom = fsptr->atom;
		@@ -1544,7 +1540,7 @@ int FixShake::rendezvous_shake(int n, char *inbuf,
		int &flag, int &proclist, char &outbuf,
		void *ptr)
		{
		int i,j,m;
		int i,m;

		FixShake fsptr = (FixShake ) ptr;
		Atom *atom = fsptr->atom;

src/comm.cpp

+2 −6

Original line number	Diff line number	Diff line
		@@ -1121,9 +1121,7 @@ void Comm::rendezvous_stats(int n, int nout, int nrvous, int nrvous_out,
		size_out_all/outsize,1.0*size_out_all/nprocs/outsize,
		size_out_max/outsize,size_out_min/outsize);
		else
		fprintf(screen," output datum count: "
		BIGINT_FORMAT " %g " BIGINT_FORMAT " " BIGINT_FORMAT "\n",
		0,0.0,0,0);
		fprintf(screen," output datum count: %d %g %d %d\n",0,0.0,0,0);
		fprintf(screen," output data (MB): %g %g %g %g\n",
		1.0size_out_all/mbytes,1.0size_out_all/nprocs/mbytes,
		1.0size_out_max/mbytes,1.0size_out_min/mbytes);
		@@ -1140,9 +1138,7 @@ void Comm::rendezvous_stats(int n, int nout, int nrvous, int nrvous_out,
		size_outrvous_all/outsize,1.0*size_outrvous_all/nprocs/outsize,
		size_outrvous_max/outsize,size_outrvous_min/outsize);
		else
		fprintf(screen," output rvous datum count: "
		BIGINT_FORMAT " %g " BIGINT_FORMAT " " BIGINT_FORMAT "\n",
		0,0.0,0,0);
		fprintf(screen," output rvous datum count: %d %g %d %d\n",0,0.0,0,0);
		fprintf(screen," output rvous data (MB): %g %g %g %g\n",
		1.0size_outrvous_all/mbytes,1.0size_outrvous_all/nprocs/mbytes,
		1.0size_outrvous_max/mbytes,1.0size_outrvous_min/mbytes);

src/hashlittle.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -155,7 +155,6 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
		u.ptr = key;
		if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
		const uint32_t k = (const uint32_t )key; /* read 32-bit chunks */
		const uint8_t *k8;

		/------ all but last block: aligned reads and affect 32 bits of (a,b,c) /
		while (length > 12)
		@@ -199,7 +198,7 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval)

		#else /* make valgrind happy */

		k8 = (const uint8_t *)k;
		const uint8_t k8 = (const uint8_t )k;
		switch(length)
		{
		case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;

src/special.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -334,7 +334,6 @@ void Special::onethree_build()
		{
		int i,j,k,m,proc;

		tagint *tag = atom->tag;
		int **nspecial = atom->nspecial;
		int nlocal = atom->nlocal;

		@@ -440,7 +439,6 @@ void Special::onefour_build()
		{
		int i,j,k,m,proc;

		tagint *tag = atom->tag;
		int **nspecial = atom->nspecial;
		int nlocal = atom->nlocal;

Admin message