Commit 4308f005 authored by Trung Nguyen's avatar Trung Nguyen
Browse files

Updated pair body rounded/polygon

parent 41687a84
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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;
}

/* ---------------------------------------------------------------------- */