git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15429 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
@ -261,8 +261,6 @@ void Fix::v_setup(int vflag)
|
|||||||
|
|
||||||
void Fix::ev_tally(int n, int *list, double total, double eng, double *v)
|
void Fix::ev_tally(int n, int *list, double total, double eng, double *v)
|
||||||
{
|
{
|
||||||
int m;
|
|
||||||
|
|
||||||
if (eflag_atom) {
|
if (eflag_atom) {
|
||||||
double fraction = eng/total;
|
double fraction = eng/total;
|
||||||
for (int i = 0; i < n; i++)
|
for (int i = 0; i < n; i++)
|
||||||
|
|||||||
@ -93,7 +93,7 @@ FixPrint::FixPrint(LAMMPS *lmp, int narg, char **arg) :
|
|||||||
// since don't know a priori which are invoked via variables by this fix
|
// since don't know a priori which are invoked via variables by this fix
|
||||||
// once in end_of_step() can set timestep for ones actually invoked
|
// once in end_of_step() can set timestep for ones actually invoked
|
||||||
|
|
||||||
int nfirst = (update->ntimestep/nevery)*nevery + nevery;
|
const bigint nfirst = (update->ntimestep/nevery)*nevery + nevery;
|
||||||
modify->addstep_compute_all(nfirst);
|
modify->addstep_compute_all(nfirst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -545,7 +545,7 @@ void FixStoreState::end_of_step()
|
|||||||
// if any compute/fix/variable and nevery, wrap with clear/add
|
// if any compute/fix/variable and nevery, wrap with clear/add
|
||||||
|
|
||||||
if (cfv_any && nevery) {
|
if (cfv_any && nevery) {
|
||||||
int nextstep = (update->ntimestep/nevery)*nevery + nevery;
|
const bigint nextstep = (update->ntimestep/nevery)*nevery + nevery;
|
||||||
modify->addstep_compute(nextstep);
|
modify->addstep_compute(nextstep);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -98,6 +98,7 @@ Timer::Timer(LAMMPS *lmp) : Pointers(lmp)
|
|||||||
_timeout = -1.0;
|
_timeout = -1.0;
|
||||||
_checkfreq = 10;
|
_checkfreq = 10;
|
||||||
_nextcheck = -1;
|
_nextcheck = -1;
|
||||||
|
this->_stamp(RESET);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------- */
|
||||||
|
|||||||
Reference in New Issue
Block a user