(6ec15500) · Commits · 郑智淋 / lammps

src/GRANULAR/fix_wall_gran.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ FixWallGran::FixWallGran(LAMMPS lmp, int narg, char *arg) :
		if (!atom->sphere_flag)
		error->all(FLERR,"Fix wall/gran requires atom style sphere");

		restart_peratom = 1;
		create_attribute = 1;

		// set interaction style
		@@ -65,8 +64,8 @@ FixWallGran::FixWallGran(LAMMPS lmp, int narg, char *arg) :
		//else if (strcmp(arg[3],"bonded/history") == 0) pairstyle = BONDED_HISTORY;
		else error->all(FLERR,"Invalid fix wall/gran interaction style");

		history = 1;
		if (pairstyle == HOOKE) history = 0;
		history = restart_peratom = 1;
		if (pairstyle == HOOKE) history = restart_peratom = 0;

		// wall/particle coefficients

+1 −1

Original line number	Diff line number	Diff line
		@@ -707,7 +707,7 @@ void LAMMPS::init()
		atom->init(); // atom must come after force and domain
		// atom deletes extra array
		// used by fix shear_history::unpack_restart()
		// when force->pair->gran_history creates fix ??
		// when force->pair->gran_history creates fix
		// atom_vec init uses deform_vremap
		modify->init(); // modify must come after update, force, atom, domain
		neighbor->init(); // neighbor must come after force, modify