Fixed initialization of arrays in fixes (2c7241bf) · Commits · 郑智淋 / lammps

src/fix_controller.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;

+7 −5

Original line number	Diff line number	Diff line
		@@ -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,10 +368,12 @@ FixDeform::FixDeform(LAMMPS lmp, int narg, char *arg) : Fix(lmp, narg, arg)

		FixDeform::~FixDeform()
		{
		if(set) {
		for (int i = 0; i < 6; i++) {
		delete [] set[i].hstr;
		delete [] set[i].hratestr;
		}
		}
		delete [] set;
		delete [] rfix;

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/* ---------------------------------------------------------------------- */

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);