diff --git a/src/fix_controller.cpp b/src/fix_controller.cpp index d931686515..ee3e97c942 100644 --- a/src/fix_controller.cpp +++ b/src/fix_controller.cpp @@ -33,7 +33,8 @@ enum{COMPUTE,FIX,VARIABLE}; /* ---------------------------------------------------------------------- */ FixController::FixController(LAMMPS *lmp, int narg, char **arg) : - Fix(lmp, narg, arg) + Fix(lmp, narg, arg), + pvID(NULL), cvID(NULL) { if (narg != 11) error->all(FLERR,"Illegal fix controller command"); @@ -50,8 +51,6 @@ FixController::FixController(LAMMPS *lmp, int narg, char **arg) : ki = force->numeric(FLERR,arg[6]); kd = force->numeric(FLERR,arg[7]); - pvID = cvID = NULL; - // process variable arg int iarg = 8; diff --git a/src/fix_deform.cpp b/src/fix_deform.cpp index 7003b4d396..171a90ba3a 100644 --- a/src/fix_deform.cpp +++ b/src/fix_deform.cpp @@ -46,7 +46,8 @@ enum{NO_REMAP,X_REMAP,V_REMAP}; /* ---------------------------------------------------------------------- */ -FixDeform::FixDeform(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg) +FixDeform::FixDeform(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg), +rfix(NULL), irregular(NULL), set(NULL) { if (narg < 4) error->all(FLERR,"Illegal fix deform command"); @@ -355,7 +356,6 @@ FixDeform::FixDeform(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg) next_reneighbor = -1; nrigid = 0; - rfix = NULL; flip = 0; if (force_reneighbor) irregular = new Irregular(lmp); @@ -368,9 +368,11 @@ FixDeform::FixDeform(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg) FixDeform::~FixDeform() { - for (int i = 0; i < 6; i++) { - delete [] set[i].hstr; - delete [] set[i].hratestr; + if(set) { + for (int i = 0; i < 6; i++) { + delete [] set[i].hstr; + delete [] set[i].hratestr; + } } delete [] set; delete [] rfix; diff --git a/src/fix_enforce2d.cpp b/src/fix_enforce2d.cpp index f61cc186c1..21a99e3c16 100644 --- a/src/fix_enforce2d.cpp +++ b/src/fix_enforce2d.cpp @@ -26,12 +26,12 @@ using namespace FixConst; /* ---------------------------------------------------------------------- */ FixEnforce2D::FixEnforce2D(LAMMPS *lmp, int narg, char **arg) : - Fix(lmp, narg, arg) + Fix(lmp, narg, arg), + flist(NULL) { if (narg != 3) error->all(FLERR,"Illegal fix enforce2d command"); nfixlist = 0; - flist = NULL; } /* ---------------------------------------------------------------------- */ diff --git a/src/fix_external.cpp b/src/fix_external.cpp index 16494662f7..c7c865cd57 100644 --- a/src/fix_external.cpp +++ b/src/fix_external.cpp @@ -29,7 +29,8 @@ enum{PF_CALLBACK,PF_ARRAY}; /* ---------------------------------------------------------------------- */ FixExternal::FixExternal(LAMMPS *lmp, int narg, char **arg) : - Fix(lmp, narg, arg) + Fix(lmp, narg, arg), + fexternal(NULL) { if (narg < 4) error->all(FLERR,"Illegal fix external command"); @@ -56,7 +57,6 @@ FixExternal::FixExternal(LAMMPS *lmp, int narg, char **arg) : // perform initial allocation of atom-based array // register with Atom class - fexternal = NULL; grow_arrays(atom->nmax); atom->add_callback(0);