Merge pull request #1030 from akohlmey/collected-small-fixes

Collected small fixes for the next patch release

doc/src/Section_howto.txt

@@ -1158,7 +1158,7 @@ styles"_pair_style.html that generate torque:
 "pair_style lubricate"_pair_lubricate.html
 "pair_style line/lj"_pair_line_lj.html
 "pair_style tri/lj"_pair_tri_lj.html
-"pair_style body"_pair_body.html :ul
+"pair_style body"_pair_body_nparticle.html :ul
 
 The granular pair styles are used with spherical particles.  The
 dipole pair style is used with the dipole atom style, which could be
@@ -1269,7 +1269,7 @@ list of sub-particles.  Individual body partices are typically treated
 as rigid bodies, and their motion integrated with a command like "fix
 nve/body"_fix_nve_body.html.  Interactions between pairs of body
 particles are computed via a command like "pair_style
-body"_pair_body.html.
+body"_pair_body_nparticle.html.
 
 :line
 

doc/src/fixes.txt

@@ -168,6 +168,8 @@ Fixes :h1
    fix_viscosity
    fix_viscous
    fix_wall
+   fix_wall_body_polygon
+   fix_wall_body_polyhedron
    fix_wall_ees
    fix_wall_gran
    fix_wall_gran_region

doc/src/pairs.txt

@@ -10,8 +10,9 @@ Pair Styles :h1
    pair_airebo
    pair_awpmd
    pair_beck
-   pair_body
+   pair_body_nparticle
    pair_body_rounded_polygon
+   pair_body_rounded_polyhedron
    pair_bop
    pair_born
    pair_brownian

examples/USER/diffraction/BulkNi.in

@@ -20,7 +20,7 @@ compute         XRD all xrd  1.541838 Ni 2Theta 40 80 c 2 2 2 LP 1 echo
 compute         SAED all saed 0.0251  Ni Kmax 0.85 Zone 1 0 0 c 0.025 0.025 0.025  &
                 dR_Ewald 0.05 echo manual
 
-fix             1 all ave/histo 1 1 1 40 80 200 c_XRD[1] c_XRD[2] &
+fix             1 all ave/histo/weight 1 1 1 40 80 200 c_XRD[1] c_XRD[2] &
                 mode vector file $A.hist.xrd
 
 fix             2 all saed/vtk 1 1 1 c_SAED file $A_001.saed 

src/MANYBODY/pair_eam_cd.h

@@ -18,8 +18,8 @@ PairStyle(eam/cd/old,PairEAMCD_TwoSite)
 
 #else
 
-#ifndef LMP_PAIR_CDEAM_H
-#define LMP_PAIR_CDEAM_H
+#ifndef LMP_PAIR_EAM_CD_H
+#define LMP_PAIR_EAM_CD_H
 
 #include "pair_eam_alloy.h"
 

src/Purge.list

@@ -24,6 +24,9 @@ style_nstencil.h
 style_ntopo.h
 # other auto-generated files
 lmpinstalledpkgs.h
+# renamed on 31 July 2018
+pair_cdeam.h
+pair_cdeam.cpp
 # renamed on 20 July 2018
 pair_body.h
 pair_body.cpp