sync GHub with SVN

2017-01-26 14:06:43 -07:00
parent 18e5584311
commit f8506fee23
11 changed files with 37 additions and 12 deletions
--- a/src/improper_hybrid.cpp
+++ b/src/improper_hybrid.cpp
@ -105,7 +105,7 @@ void ImproperHybrid::compute(int eflag, int vflag)
  // accumulate sub-style global/peratom energy/virial in hybrid

  if (eflag || vflag) ev_setup(eflag,vflag);
-  else evflag = 0;
+  else evflag = eflag_global = vflag_global = eflag_atom = vflag_atom = 0;

  for (m = 0; m < nstyles; m++) {
    neighbor->nimproperlist = nimproperlist[m];