Merge branch 'master' into improve-include-consistency

# Conflicts: # src/USER-MESO/atom_vec_tdpd.cpp
2019-07-09 14:50:00 -04:00
parent 31e19e0824 691fc357a4
commit 06dcc9e283
610 changed files with 39096 additions and 8292 deletions
--- a/src/compute_heat_flux.cpp
+++ b/src/compute_heat_flux.cpp
@ -69,7 +69,7 @@ ComputeHeatFlux::ComputeHeatFlux(LAMMPS *lmp, int narg, char **arg) :
    error->all(FLERR,
               "Compute heat/flux compute ID does not compute stress/atom");

-  vector = new double[6];
+  vector = new double[size_vector];
 }

 /* ---------------------------------------------------------------------- */