make IDs of 2 fix neigh history instances unique (09e539cc) · Commits · 郑智淋 / lammps

src/GRANULAR/pair_gran_hooke_history.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ PairGranHookeHistory::PairGranHookeHistory(LAMMPS *lmp) : Pair(lmp)
		fix_history = NULL;

		char *fixarg = new char[3];
		fixarg[0] = (char *) "NEIGH_HISTORY_DUMMY";
		fixarg[0] = (char *) "NEIGH_HISTORY_HOOKE_HERTZ_DUMMY";
		fixarg[1] = (char *) "all";
		fixarg[2] = (char *) "DUMMY";
		modify->add_fix(3,fixarg,1);
		@@ -83,8 +83,8 @@ PairGranHookeHistory::~PairGranHookeHistory()

		delete [] svector;

		if (!fix_history) modify->delete_fix("NEIGH_HISTORY_DUMMY");
		else modify->delete_fix("NEIGH_HISTORY");
		if (!fix_history) modify->delete_fix("NEIGH_HISTORY_HOOKE_HERTZ_DUMMY");
		else modify->delete_fix("NEIGH_HISTORY_HOOKE_HERTZ");

		if (allocated) {
		memory->destroy(setflag);
		@@ -435,13 +435,13 @@ void PairGranHookeHistory::init_style()
		char dnumstr[16];
		sprintf(dnumstr,"%d",size_history);
		char *fixarg = new char[4];
		fixarg[0] = (char *) "NEIGH_HISTORY";
		fixarg[0] = (char *) "NEIGH_HISTORY_HOOKE_HERTZ";
		fixarg[1] = (char *) "all";
		fixarg[2] = (char *) "NEIGH_HISTORY";
		fixarg[3] = dnumstr;
		modify->replace_fix("NEIGH_HISTORY_DUMMY",4,fixarg,1);
		modify->replace_fix("NEIGH_HISTORY_HOOKE_HERTZ_DUMMY",4,fixarg,1);
		delete [] fixarg;
		int ifix = modify->find_fix("NEIGH_HISTORY");
		int ifix = modify->find_fix("NEIGH_HISTORY_HOOKE_HERTZ");
		fix_history = (FixNeighHistory *) modify->fix[modify->ifix];
		fix_history->pair = this;
		}
		@@ -509,7 +509,7 @@ void PairGranHookeHistory::init_style()
		// set fix which stores history info

		if (history) {
		int ifix = modify->find_fix("NEIGH_HISTORY");
		int ifix = modify->find_fix("NEIGH_HISTORY_HOOKE_HERTZ");
		if (ifix < 0) error->all(FLERR,"Could not find pair fix neigh history ID");
		fix_history = (FixNeighHistory *) modify->fix[ifix];
		}

src/GRANULAR/pair_granular.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ PairGranular::PairGranular(LAMMPS *lmp) : Pair(lmp)
		fix_history = NULL;

		char *fixarg = new char[3];
		fixarg[0] = (char *) "NEIGH_HISTORY_DUMMY";
		fixarg[0] = (char *) "NEIGH_HISTORY_GRANULAR_DUMMY";
		fixarg[1] = (char *) "all";
		fixarg[2] = (char *) "DUMMY";
		modify->add_fix(3,fixarg,1);
		@@ -112,8 +112,8 @@ PairGranular::~PairGranular()
		{
		delete [] svector;

		if (!fix_history) modify->delete_fix("NEIGH_HISTORY_DUMMY");
		else modify->delete_fix("NEIGH_HISTORY");
		if (!fix_history) modify->delete_fix("NEIGH_HISTORY_GRANULAR_DUMMY");
		else modify->delete_fix("NEIGH_HISTORY_GRANULAR");

		if (allocated) {
		memory->destroy(setflag);
		@@ -1045,13 +1045,13 @@ void PairGranular::init_style()
		char dnumstr[16];
		sprintf(dnumstr,"%d",size_history);
		char *fixarg = new char[4];
		fixarg[0] = (char *) "NEIGH_HISTORY";
		fixarg[0] = (char *) "NEIGH_HISTORY_GRANULAR";
		fixarg[1] = (char *) "all";
		fixarg[2] = (char *) "NEIGH_HISTORY";
		fixarg[3] = dnumstr;
		modify->replace_fix("NEIGH_HISTORY_DUMMY",4,fixarg,1);
		modify->replace_fix("NEIGH_HISTORY_GRANULAR_DUMMY",4,fixarg,1);
		delete [] fixarg;
		int ifix = modify->find_fix("NEIGH_HISTORY");
		int ifix = modify->find_fix("NEIGH_HISTORY_GRANULAR");
		fix_history = (FixNeighHistory *) modify->fix[modify->ifix];
		fix_history->pair = this;
		}
		@@ -1122,7 +1122,7 @@ void PairGranular::init_style()
		// set fix which stores history info

		if (size_history > 0) {
		int ifix = modify->find_fix("NEIGH_HISTORY");
		int ifix = modify->find_fix("NEIGH_HISTORY_GRANULAR");
		if (ifix < 0) error->all(FLERR,"Could not find pair fix neigh history ID");
		fix_history = (FixNeighHistory *) modify->fix[ifix];
		}

Admin message