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

Updated pair body rounded/polygon

Browse Source
This commit is contained in:
Trung Nguyen
2018-05-24 23:12:01 -05:00
parent 41687a84a4
commit 4308f005ab
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BODY/pair_body_rounded_polygon.cpp
View File

@ -374,6 +374,8 @@ void PairBodyRoundedPolygon::settings(int narg, char **arg)
mu = force->numeric(FLERR,arg[2]);
delta_ua = force->numeric(FLERR,arg[3]);
cut_inner = force->numeric(FLERR,arg[4]);
if (delta_ua < 0) delta_ua = 1;
}
/* ----------------------------------------------------------------------
@ -1078,12 +1080,12 @@ int PairBodyRoundedPolygon::compute_distance_to_vertex(int ibody,
// check if x0 (the queried vertex) and xmi (the body's center of mass)
// are on the different sides of the edge
int m = opposite_sides(xi1, xi2, x0, xmi);
int m = 1;//opposite_sides(xi1, xi2, x0, xmi);
if (m == 0) {
// x0 and xmi are on not the opposite sides of the edge
// leave xpi for another edge to detect
// leave xpi for another edge to detect -- for convex shapes only
mode = NONE;

3
src/BODY/pair_body_rounded_polyhedron.cpp
View File

@ -82,6 +82,9 @@ PairBodyRoundedPolyhedron::PairBodyRoundedPolyhedron(LAMMPS *lmp) : Pair(lmp)
c_t = 0.2;
mu = 0.0;
A_ua = 1.0;
k_n = NULL;
k_na = NULL;
}
/* ---------------------------------------------------------------------- */