jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a bug with indexing the replaced fix and optional args

This commit is contained in:
Steve Plimpton 2019-11-05 16:59:44 -07:00
parent d8ef5f6991
commit ca0cf23a4b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GRANULAR/pair_gran_hooke_history.cpp
View File

@ -441,7 +441,8 @@ void PairGranHookeHistory::init_style()
fixarg[3] = dnumstr;
modify->replace_fix("NEIGH_HISTORY_DUMMY",4,fixarg,1);
delete [] fixarg;
fix_history = (FixNeighHistory *) modify->fix[modify->nfix-1];
int ifix = modify->find_fix("NEIGH_HISTORY");
fix_history = (FixNeighHistory *) modify->fix[modify->ifix];
fix_history->pair = this;
}

3
src/GRANULAR/pair_granular.cpp
View File

@ -1051,7 +1051,8 @@ void PairGranular::init_style()
fixarg[3] = dnumstr;
modify->replace_fix("NEIGH_HISTORY_DUMMY",4,fixarg,1);
delete [] fixarg;
fix_history = (FixNeighHistory *) modify->fix[modify->nfix-1];
int ifix = modify->find_fix("NEIGH_HISTORY");
fix_history = (FixNeighHistory *) modify->fix[modify->ifix];
fix_history->pair = this;
}

11
src/fix_dummy.cpp
View File

@ -29,7 +29,7 @@ FixDummy::FixDummy(LAMMPS *lmp, int narg, char **arg) :
// (a) the real fix you are placeholding for defines the method
// (b) the real fix will be defined so late in run initialization
// that the dummy fix will have already been processed by Modify::init()
// to add its index to its lists of fixes to invoke during timestepping
// so its index needs to be added to lists of fixes invoked during a run
initial_integrate_flag = final_integrate_flag = 0;
pre_exchange_flag = pre_neighbor_flag = 0;
@ -40,10 +40,11 @@ FixDummy::FixDummy(LAMMPS *lmp, int narg, char **arg) :
while (iarg < narg) {
if (strcmp(arg[iarg],"initial_integrate") == 0) initial_integrate_flag = 1;
else if (strcmp(arg[iarg],"final_integrate") == 0) final_integrate_flag = 1;
else if (strcmp(arg[iarg],"final_integrate") == 0) final_integrate_flag = 1;
else if (strcmp(arg[iarg],"final_integrate") == 0) final_integrate_flag = 1;
else if (strcmp(arg[iarg],"final_integrate") == 0) final_integrate_flag = 1;
else if (strcmp(arg[iarg],"final_integrate") == 0) final_integrate_flag = 1;
else if (strcmp(arg[iarg],"pre_exchange") == 0) pre_exchange_flag = 1;
else if (strcmp(arg[iarg],"pre_neighbor") == 0) pre_neighbor_flag = 1;
else if (strcmp(arg[iarg],"pre_force") == 0) pre_force_flag = 1;
else if (strcmp(arg[iarg],"post_force") == 0) post_force_flag = 1;
else if (strcmp(arg[iarg],"end_of_step") == 0) end_of_step_flag = 1;
else error->all(FLERR,"Illegal fix DUMMY command");
iarg++;
}