sync with Git

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15519 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-08-29 22:52:03 +00:00
parent 236241b100
commit 2993aec312
48 changed files with 109 additions and 135 deletions
--- a/src/compute_contact_atom.cpp
+++ b/src/compute_contact_atom.cpp
@ -32,7 +32,8 @@ using namespace LAMMPS_NS;
 /* ---------------------------------------------------------------------- */

 ComputeContactAtom::ComputeContactAtom(LAMMPS *lmp, int narg, char **arg) :
-  Compute(lmp, narg, arg)
+  Compute(lmp, narg, arg),
+  contact(NULL)
 {
  if (narg != 3) error->all(FLERR,"Illegal compute contact/atom command");

@ -41,7 +42,6 @@ ComputeContactAtom::ComputeContactAtom(LAMMPS *lmp, int narg, char **arg) :
  comm_reverse = 1;

  nmax = 0;
-  contact = NULL;

  // error checks