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

T2345: Replace instances of NULL with nullptr

Browse Source 
The following changes have been applied to src and lib folders:
regex replace: ([^"_])NULL ⇒ \1nullptr (8968 chgs in src, 1153 in lib)
Manually find/change: (void \*) nullptr ⇒ nullptr (1 case)
regex find: ".*?nullptr.*?"
  Manually ~14 cases back to "NULL" in src, ~2 in lib
  regex finds a few false positive where nullptr appears between two
  strings in a function call
This commit is contained in:
Anne Gunn
2020-09-11 07:39:46 -06:00
parent 101d39142e
commit f1ef7d85a8
1217 changed files with 8531 additions and 8531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/fix_ave_chunk.cpp
View File

@ -46,12 +46,12 @@ enum{ONE,RUNNING,WINDOW};
FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg),
nvalues(0), nrepeat(0),
which(NULL), argindex(NULL), value2index(NULL), ids(NULL),
fp(NULL), idchunk(NULL), varatom(NULL),
count_one(NULL), count_many(NULL), count_sum(NULL),
values_one(NULL), values_many(NULL), values_sum(NULL),
count_total(NULL), count_list(NULL),
values_total(NULL), values_list(NULL)
which(nullptr), argindex(nullptr), value2index(nullptr), ids(nullptr),
fp(nullptr), idchunk(nullptr), varatom(nullptr),
count_one(nullptr), count_many(nullptr), count_sum(nullptr),
values_one(nullptr), values_many(nullptr), values_sum(nullptr),
count_total(nullptr), count_list(nullptr),
values_total(nullptr), values_list(nullptr)
{
if (narg < 7) error->all(FLERR,"Illegal fix ave/chunk command");
@ -88,7 +88,7 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
int iarg = 0;
while (iarg < nargnew) {
ids[nvalues] = NULL;
ids[nvalues] = nullptr;
if (strcmp(arg[iarg],"vx") == 0) {
which[nvalues] = V;
@ -164,15 +164,15 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
ave = ONE;
nwindow = 0;
biasflag = 0;
id_bias = NULL;
id_bias = nullptr;
adof = domain->dimension;
cdof = 0.0;
overwrite = 0;
format_user = NULL;
format_user = nullptr;
format = (char *) " %g";
char *title1 = NULL;
char *title2 = NULL;
char *title3 = NULL;
char *title1 = nullptr;
char *title2 = nullptr;
char *title3 = nullptr;
while (iarg < nargnew) {
if (strcmp(arg[iarg],"norm") == 0) {
@ -225,7 +225,7 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
if (iarg+2 > narg) error->all(FLERR,"Illegal fix ave/chunk command");
if (me == 0) {
fp = fopen(arg[iarg+1],"w");
if (fp == NULL)
if (fp == nullptr)
error->one(FLERR,fmt::format("Cannot open fix ave/chunk file {}: {}",
arg[iarg+1], utils::getsyserror()));
}
@ -409,12 +409,12 @@ FixAveChunk::FixAveChunk(LAMMPS *lmp, int narg, char **arg) :
normcount = 0;
maxvar = 0;
varatom = NULL;
varatom = nullptr;
count_one = count_many = count_sum = count_total = NULL;
count_list = NULL;
values_one = values_many = values_sum = values_total = NULL;
values_list = NULL;
count_one = count_many = count_sum = count_total = nullptr;
count_list = nullptr;
values_one = values_many = values_sum = values_total = nullptr;
values_list = nullptr;
maxchunk = 0;
nchunk = 1;
@ -466,24 +466,24 @@ FixAveChunk::~FixAveChunk()
}
delete [] idchunk;
which = NULL;
argindex = NULL;
ids = NULL;
value2index = NULL;
fp = NULL;
varatom = NULL;
count_one = NULL;
count_many = NULL;
count_sum = NULL;
count_total = NULL;
count_list = NULL;
values_one = NULL;
values_many = NULL;
values_sum = NULL;
values_total = NULL;
values_list = NULL;
idchunk = NULL;
cchunk = NULL;
which = nullptr;
argindex = nullptr;
ids = nullptr;
value2index = nullptr;
fp = nullptr;
varatom = nullptr;
count_one = nullptr;
count_many = nullptr;
count_sum = nullptr;
count_total = nullptr;
count_list = nullptr;
values_one = nullptr;
values_many = nullptr;
values_sum = nullptr;
values_total = nullptr;
values_list = nullptr;
idchunk = nullptr;
cchunk = nullptr;
}
/* ---------------------------------------------------------------------- */
@ -1110,7 +1110,7 @@ void FixAveChunk::allocate()
double FixAveChunk::compute_array(int i, int j)
{
if (values_total == NULL) return 0.0;
if (values_total == nullptr) return 0.0;
if (i >= nchunk) return 0.0;
if (j < colextra) {
if (cchunk->compress) {