Commit 2d132cad authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #258 from andeplane/IP_GRANULAR 

Initialize pointers in GRANULAR
parents ef6801f8 c5869bde

src/GRANULAR/fix_pour.cpp

+4 −1
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; // several files 
/* ---------------------------------------------------------------------- */



FixPour::FixPour(LAMMPS *lmp, int narg, char **arg) :

  Fix(lmp, narg, arg)

  Fix(lmp, narg, arg), radius_poly(NULL), frac_poly(NULL), 

  idrigid(NULL), idshake(NULL), onemols(NULL), molfrac(NULL), coords(NULL), 

  imageflags(NULL), fixrigid(NULL), fixshake(NULL), recvcounts(NULL), 

  displs(NULL), random(NULL), random2(NULL)

{

  if (narg < 6) error->all(FLERR,"Illegal fix pour command");

src/GRANULAR/fix_wall_gran.cpp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ enum{NONE,CONSTANT,EQUAL}; 
/* ---------------------------------------------------------------------- */



FixWallGran::FixWallGran(LAMMPS *lmp, int narg, char **arg) :

  Fix(lmp, narg, arg)

  Fix(lmp, narg, arg), idregion(NULL), shearone(NULL), fix_rigid(NULL), mass_rigid(NULL)

{

  if (narg < 4) error->all(FLERR,"Illegal fix wall/gran command");

src/GRANULAR/fix_wall_gran_region.cpp

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ enum{HOOKE,HOOKE_HISTORY,HERTZ_HISTORY,BONDED_HISTORY}; 
/* ---------------------------------------------------------------------- */



FixWallGranRegion::FixWallGranRegion(LAMMPS *lmp, int narg, char **arg) :

  FixWallGran(lmp, narg, arg)

  FixWallGran(lmp, narg, arg), region(NULL), region_style(NULL), ncontact(NULL), 

  walls(NULL), shearmany(NULL), c2r(NULL)

{

  restart_global = 1;

  motion_resetflag = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE