mended un-done changes from Git master

This commit is contained in:
Steven J. Plimpton
2018-07-24 11:36:12 -06:00
parent 2f55981224
commit b08a2fcd3b
3 changed files with 11 additions and 3 deletions

View File

@ -681,6 +681,8 @@ USER-INTEL, k = KOKKOS, o = USER-OMP, t = OPT.
"vector"_fix_vector.html,
"viscosity"_fix_viscosity.html,
"viscous"_fix_viscous.html,
"wall/body/polygon"_fix_wall_body_polygon.html,
"wall/body/polyhedron"_fix_wall_body_polyhedron.html,
"wall/colloid"_fix_wall.html,
"wall/gran"_fix_wall_gran.html,
"wall/gran/region"_fix_wall_gran_region.html,
@ -933,7 +935,9 @@ KOKKOS, o = USER-OMP, t = OPT.
"airebo (oi)"_pair_airebo.html,
"airebo/morse (oi)"_pair_airebo.html,
"beck (go)"_pair_beck.html,
"body"_pair_body.html,
"body/nparticle"_pair_body_nparticle.html,
"body/rounded/polygon"_pair_body_rounded/polygon.html,
"body/rounded/polyhedron"_pair_body_rounded/polyhedron.html,
"bop"_pair_bop.html,
"born (go)"_pair_born.html,
"born/coul/dsf"_pair_born.html,

View File

@ -144,7 +144,7 @@ fix_bond_break.html
fix_bond_create.html
fix_bond_react.html
fix_bond_swap.html
fix_box_relax.htmlf
fix_box_relax.html
fix_client_md.html
fix_cmap.html
fix_colvars.html
@ -288,6 +288,8 @@ fix_vector.html
fix_viscosity.html
fix_viscous.html
fix_wall.html
fix_wall_body_polygon.html
fix_wall_body_polyhedron.html
fix_wall_ees.html
fix_wall_gran.html
fix_wall_gran_region.html
@ -429,8 +431,9 @@ pair_agni.html
pair_airebo.html
pair_awpmd.html
pair_beck.html
pair_body.html
pair_body_nparticle.html
pair_body_rounded_polygon.html
pair_body_rounded_polyhedron.html
pair_bop.html
pair_born.html
pair_brownian.html

View File

@ -1208,6 +1208,7 @@ int Domain::closest_image(double *pos, int j)
/* ----------------------------------------------------------------------
find and return Xj image = periodic image of Xj that is closest to Xi
for triclinic, add/subtract tilt factors in other dims as needed
called by ServerMD class
------------------------------------------------------------------------- */
void Domain::closest_image(double *xi, double *xj, double *xjimage)