Merge branch 'master' into symbolic-atom-constants

2020-09-15 17:44:31 -04:00
parent 618b08dcfc cebf6d33ba
commit 0f6a34775c
1186 changed files with 8448 additions and 8360 deletions
--- a/src/fix_numdiff.cpp
+++ b/src/fix_numdiff.cpp
@ -40,8 +40,8 @@ using namespace FixConst;
 /* ---------------------------------------------------------------------- */

 FixNumDiff::FixNumDiff(LAMMPS *lmp, int narg, char **arg) :
-  Fix(lmp, narg, arg), id_pe(NULL), numdiff_forces(NULL),
-  temp_x(NULL), temp_f(NULL)
+  Fix(lmp, narg, arg), id_pe(nullptr), numdiff_forces(nullptr),
+  temp_x(nullptr), temp_f(nullptr)
 {
  if (narg < 5) error->all(FLERR,"Illegal fix numdiff command");