Merge branch 'master' into varargs-log-error-functions

2021-04-26 13:27:58 -04:00
parent e9e0bb71b6 31d244dd80
commit 6b04ebd617
1845 changed files with 3369 additions and 3357 deletions
--- a/src/fix_ave_time.cpp
+++ b/src/fix_ave_time.cpp
@ -723,7 +723,6 @@ void FixAveTime::invoke_vector(bigint ntimestep)
        allocate_arrays();
      }

-      bigint ntimestep = update->ntimestep;
      int lockforever_flag = 0;
      for (i = 0; i < nvalues; i++) {
        if (!varlen[i] || which[i] != ArgInfo::COMPUTE) continue;