Merge branch 'master' into symbolic-atom-constants

This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:44:31 -04:00
1186 changed files with 8448 additions and 8360 deletions

View File

@ -45,9 +45,9 @@ enum{BOND,LBOUND,ANGLE,DIHEDRAL};
FixRestrain::FixRestrain(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg),
rstyle(NULL), mult(NULL), ids(NULL), kstart(NULL), kstop(NULL),
deqstart(NULL), deqstop(NULL), target(NULL), cos_target(NULL),
sin_target(NULL)
rstyle(nullptr), mult(nullptr), ids(nullptr), kstart(nullptr), kstop(nullptr),
deqstart(nullptr), deqstop(nullptr), target(nullptr), cos_target(nullptr),
sin_target(nullptr)
{
if (narg < 4) error->all(FLERR,"Illegal fix restrain command");