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/thermo.cpp
+++ b/src/thermo.cpp
@ -401,8 +401,9 @@ void Thermo::compute(int flag)
   call function to compute property
 ------------------------------------------------------------------------- */

-void Thermo::call_vfunc(int ifield)
+void Thermo::call_vfunc(int ifield_in)
 {
+  ifield = ifield_in;
  (this->*vfunc[ifield])();
 }