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

Fix misc. warnings (#1076)

Browse Source
This commit is contained in:
Daniel Schwen
2018-08-24 13:09:36 -06:00
parent 92a4dc25b1
commit 38a998c03c
28 changed files with 63 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BODY/body_rounded_polyhedron.cpp
View File

@ -96,7 +96,7 @@ int BodyRoundedPolyhedron::nedges(AtomVecBody::Bonus *bonus)
{
int nvertices = bonus->ivalue[0];
int nedges = bonus->ivalue[1];
int nfaces = bonus->ivalue[2];
//int nfaces = bonus->ivalue[2];
if (nvertices == 1) return 0;
else if (nvertices == 2) return 1;
return nedges; //(nvertices+nfaces-2); // Euler's polyon formula: V-E+F=2
@ -463,7 +463,7 @@ void BodyRoundedPolyhedron::output(int ibonus, int m, double *values)
int BodyRoundedPolyhedron::image(int ibonus, double flag1, double /*flag2*/,
int *&ivec, double **&darray)
{
int j, nelements;
int nelements;
double p[3][3];
double *x, rrad;
@ -488,7 +488,7 @@ int BodyRoundedPolyhedron::image(int ibonus, double flag1, double /*flag2*/,
nelements = nvertices;
} else {
int nfaces = bonus->ivalue[2];
//int nfaces = bonus->ivalue[2];
int nedges = bonus->ivalue[1]; //nvertices + nfaces - 2;
if (nvertices == 2) nedges = 1; // special case: rods
double* edge_ends = &bonus->dvalue[3*nvertices];