From d3a7ef6598d56e4fb658457c2d82c965e6df3563 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 10 Feb 2015 16:18:21 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13088 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/compute_stress_atom.cpp | 3 ++- src/fix_ave_atom.cpp | 2 ++ src/fix_ave_correlate.cpp | 1 + src/fix_ave_histo.cpp | 1 + src/fix_ave_spatial.cpp | 1 + src/fix_ave_time.cpp | 1 + src/fix_recenter.cpp | 3 ++- src/update.cpp | 2 +- 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/compute_stress_atom.cpp b/src/compute_stress_atom.cpp index 0e5aa749ca..45d8e20d9c 100644 --- a/src/compute_stress_atom.cpp +++ b/src/compute_stress_atom.cpp @@ -60,7 +60,8 @@ ComputeStressAtom::ComputeStressAtom(LAMMPS *lmp, int narg, char **arg) : error->all(FLERR,"Could not find compute stress/atom temperature ID"); if (modify->compute[icompute]->tempflag == 0) error->all(FLERR, - "Compute stress/atom temperature ID does not compute temperature"); + "Compute stress/atom temperature ID does not " + "compute temperature"); } // process optional args diff --git a/src/fix_ave_atom.cpp b/src/fix_ave_atom.cpp index 844a8d118a..fd69b1e05c 100644 --- a/src/fix_ave_atom.cpp +++ b/src/fix_ave_atom.cpp @@ -43,6 +43,8 @@ FixAveAtom::FixAveAtom(LAMMPS *lmp, int narg, char **arg) : nrepeat = force->inumeric(FLERR,arg[4]); peratom_freq = force->inumeric(FLERR,arg[5]); + time_depend = 1; + // parse remaining values which = new int[narg-6]; diff --git a/src/fix_ave_correlate.cpp b/src/fix_ave_correlate.cpp index b3b3e416fb..79bbec7654 100644 --- a/src/fix_ave_correlate.cpp +++ b/src/fix_ave_correlate.cpp @@ -55,6 +55,7 @@ FixAveCorrelate::FixAveCorrelate(LAMMPS * lmp, int narg, char **arg): nfreq = force->inumeric(FLERR,arg[5]); global_freq = nfreq; + time_depend = 1; // parse values until one isn't recognized diff --git a/src/fix_ave_histo.cpp b/src/fix_ave_histo.cpp index c44d5b067f..a413ada1d3 100644 --- a/src/fix_ave_histo.cpp +++ b/src/fix_ave_histo.cpp @@ -62,6 +62,7 @@ FixAveHisto::FixAveHisto(LAMMPS *lmp, int narg, char **arg) : array_flag = 1; size_array_cols = 3; extarray = 0; + time_depend = 1; lo = force->numeric(FLERR,arg[6]); hi = force->numeric(FLERR,arg[7]); diff --git a/src/fix_ave_spatial.cpp b/src/fix_ave_spatial.cpp index 0c9466ff11..1fcb3fbd17 100644 --- a/src/fix_ave_spatial.cpp +++ b/src/fix_ave_spatial.cpp @@ -59,6 +59,7 @@ FixAveSpatial::FixAveSpatial(LAMMPS *lmp, int narg, char **arg) : global_freq = nfreq; no_change_box = 1; + time_depend = 1; ndim = 0; int iarg = 6; diff --git a/src/fix_ave_time.cpp b/src/fix_ave_time.cpp index e0cf6cec3a..bb8dce35e5 100644 --- a/src/fix_ave_time.cpp +++ b/src/fix_ave_time.cpp @@ -54,6 +54,7 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) : nfreq = force->inumeric(FLERR,arg[5]); global_freq = nfreq; + time_depend = 1; // scan values to count them // then read options so know mode = SCALAR/VECTOR before re-reading values diff --git a/src/fix_recenter.cpp b/src/fix_recenter.cpp index e92c1d0e7c..4cbf0248ca 100644 --- a/src/fix_recenter.cpp +++ b/src/fix_recenter.cpp @@ -129,7 +129,8 @@ void FixRecenter::init() else if ((modify->fmask[i] & INITIAL_INTEGRATE) && after) flag = 1; } if (flag && comm->me == 0) - error->warning(FLERR,"Fix recenter should come after all other integration fixes"); + error->warning(FLERR,"Fix recenter should come after all other " + "integration fixes"); masstotal = group->mass(igroup); diff --git a/src/update.cpp b/src/update.cpp index f92c89d867..35ed780626 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -429,7 +429,7 @@ void Update::reset_timestep(bigint newstep) atimestep = ntimestep; // trigger reset of timestep for output and for fixes that require it - // do not allow any timestep-dependent fixes to be defined + // do not allow any timestep-dependent fixes to be already defined output->reset_timestep(ntimestep);