Merge branch 'master' into kim_fix

2020-07-20 20:27:41 -04:00
parent 1f819ca333 39cefc4eb3
commit 5b4275002c
51 changed files with 21877 additions and 505 deletions
--- a/src/variable.cpp
+++ b/src/variable.cpp
@ -4222,13 +4222,14 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
      if (eval_in_progress[ivar])
        print_var_error(FLERR,"Variable has circular dependency",ivar);

-      if ((method == AVE) && (nvec == 0))
-        print_var_error(FLERR,"Cannot compute average of empty vector",ivar);
-
      double *vec;
      nvec = compute_vector(ivar,&vec);
      nstride = 1;

+      if ((method == AVE) && (nvec == 0))
+        print_var_error(FLERR,"Cannot compute average of empty vector",ivar);
+
+
    } else print_var_error(FLERR,"Invalid special function in "
                           "variable formula",ivar);