ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into symbolic-atom-constants

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:44:31 -04:00
parent 618b08dcfc cebf6d33ba
commit 0f6a34775c
1186 changed files with 8448 additions and 8360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/fix_store.cpp
View File

@ -28,7 +28,7 @@ enum{UNKNOWN,GLOBAL,PERATOM};
/* ---------------------------------------------------------------------- */
FixStore::FixStore(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg),
vstore(NULL), astore(NULL), rbuf(NULL)
vstore(nullptr), astore(nullptr), rbuf(nullptr)
{
if (narg != 6) error->all(FLERR,"Illegal fix store command");
@ -69,8 +69,8 @@ vstore(NULL), astore(NULL), rbuf(NULL)
if (nvalues == 1) vecflag = 1;
}
vstore = NULL;
astore = NULL;
vstore = nullptr;
astore = nullptr;
// allocate vector or array and restart buffer rbuf
// for PERATOM, register with Atom class
@ -84,7 +84,7 @@ vstore(NULL), astore(NULL), rbuf(NULL)
grow_arrays(atom->nmax);
atom->add_callback(Atom::GROW);
if (restart_peratom) atom->add_callback(Atom::RESTART);
rbuf = NULL;
rbuf = nullptr;
}
// zero the storage
@ -145,8 +145,8 @@ void FixStore::reset_global(int nrow_caller, int ncol_caller)
memory->destroy(vstore);
memory->destroy(astore);
memory->destroy(rbuf);
vstore = NULL;
astore = NULL;
vstore = nullptr;
astore = nullptr;
vecflag = 0;
if (ncol_caller == 1) vecflag = 1;
@ -199,8 +199,8 @@ void FixStore::restart(char *buf)
memory->destroy(vstore);
memory->destroy(astore);
memory->destroy(rbuf);
vstore = NULL;
astore = NULL;
vstore = nullptr;
astore = nullptr;
vecflag = 0;
if (ncol_restart == 1) vecflag = 1;