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

cosmetic

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-04-03 15:05:09 -04:00
parent 39d12e48d6
commit ecd8fe71a1
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/BODY/pair_body_rounded_polygon.cpp
View File

@ -415,17 +415,14 @@ void PairBodyRoundedPolygon::init_style()
if (!avec)
error->all(FLERR,"Pair body/rounded/polygon requires atom style body");
if (strcmp(avec->bptr->style,"rounded/polygon") != 0)
error->all(FLERR,"Pair body/rounded/polygon requires "
"body style rounded/polygon");
error->all(FLERR,"Pair body/rounded/polygon requires body style rounded/polygon");
bptr = dynamic_cast<BodyRoundedPolygon *>(avec->bptr);
if (force->newton_pair == 0)
error->all(FLERR,"Pair style body/rounded/polygon requires "
"newton pair on");
error->all(FLERR,"Pair style body/rounded/polygon requires newton pair on");
if (comm->ghost_velocity == 0)
error->all(FLERR,"Pair body/rounded/polygon requires "
"ghost atoms store velocity");
error->all(FLERR,"Pair body/rounded/polygon requires ghost atoms store velocity");
neighbor->add_request(this);
@ -570,8 +567,7 @@ void PairBodyRoundedPolygon::body2space(int i)
}
if ((body_num_edges > 0) && (edge_ends == nullptr))
error->one(FLERR,"Inconsistent edge data for body of atom {}",
atom->tag[i]);
error->one(FLERR,"Inconsistent edge data for body of atom {}", atom->tag[i]);
for (int m = 0; m < body_num_edges; m++) {
edge[nedge][0] = static_cast<int>(edge_ends[2*m+0]);

21
src/BODY/pair_body_rounded_polyhedron.cpp
View File

@ -222,8 +222,7 @@ void PairBodyRoundedPolyhedron::compute(int eflag, int vflag)
// sphere-sphere interaction
if (npi == 1 && npj == 1) {
sphere_against_sphere(i, j, itype, jtype, delx, dely, delz,
rsq, v, f, evflag);
sphere_against_sphere(i, j, itype, jtype, delx, dely, delz, rsq, v, f, evflag);
continue;
}
@ -391,20 +390,16 @@ void PairBodyRoundedPolyhedron::coeff(int narg, char **arg)
void PairBodyRoundedPolyhedron::init_style()
{
avec = dynamic_cast<AtomVecBody *>(atom->style_match("body"));
if (!avec) error->all(FLERR,"Pair body/rounded/polyhedron requires "
"atom style body");
if (!avec) error->all(FLERR,"Pair body/rounded/polyhedron requires atom style body");
if (strcmp(avec->bptr->style,"rounded/polyhedron") != 0)
error->all(FLERR,"Pair body/rounded/polyhedron requires "
"body style rounded/polyhedron");
error->all(FLERR,"Pair body/rounded/polyhedron requires body style rounded/polyhedron");
bptr = dynamic_cast<BodyRoundedPolyhedron *>(avec->bptr);
if (force->newton_pair == 0)
error->all(FLERR,"Pair style body/rounded/polyhedron requires "
"newton pair on");
error->all(FLERR,"Pair style body/rounded/polyhedron requires newton pair on");
if (comm->ghost_velocity == 0)
error->all(FLERR,"Pair body/rounded/polyhedron requires "
"ghost atoms store velocity");
error->all(FLERR,"Pair body/rounded/polyhedron requires ghost atoms store velocity");
neighbor->add_request(this);
@ -558,8 +553,7 @@ void PairBodyRoundedPolyhedron::body2space(int i)
}
if ((body_num_edges > 0) && (edge_ends == nullptr))
error->one(FLERR,"Inconsistent edge data for body of atom {}",
atom->tag[i]);
error->one(FLERR,"Inconsistent edge data for body of atom {}", atom->tag[i]);
for (int m = 0; m < body_num_edges; m++) {
edge[nedge][0] = static_cast<int>(edge_ends[2*m+0]);
@ -585,8 +579,7 @@ void PairBodyRoundedPolyhedron::body2space(int i)
}
if ((body_num_faces > 0) && (face_pts == nullptr))
error->one(FLERR,"Inconsistent face data for body of atom {}",
atom->tag[i]);
error->one(FLERR,"Inconsistent face data for body of atom {}", atom->tag[i]);
for (int m = 0; m < body_num_faces; m++) {
for (int k = 0; k < MAX_FACE_SIZE; k++)