git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13283 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2015-03-24 16:00:43 +00:00
parent 25b928b276
commit 69841d9e85
5 changed files with 24 additions and 8 deletions

View File

@ -274,7 +274,11 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
}
// enable locking of row count by this fix for computes of variable length
// only if nrepeat > 1, so that locking spans multiple timesteps
// only if nrepeat > 1 or ave = RUNNING/WINDOW,
// so that locking spans multiple timesteps
// trigger lock_length here for ave = RUN/WINDOW
// or in end_of_step() for nrepeat > 1,
// so that row count = number of chunks is set
if (any_variable_length &&
(nrepeat > 1 || ave == RUNNING || ave == WINDOW)) {
@ -282,8 +286,10 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
if (varlen[i]) {
int icompute = modify->find_compute(ids[i]);
modify->compute[icompute]->lock_enable();
if (ave == RUNNING || ave == WINDOW)
if (ave == RUNNING || ave == WINDOW) {
modify->compute[icompute]->lock_length();
modify->compute[icompute]->lock(this,update->ntimestep,-1);
}
}
}