incorporate edits by steve plimpton for the upstream LAMMPS version