Commit a57a5c76 authored by Anne Gunn's avatar Anne Gunn
Browse files

T2345: After examining comments changed by batch conversion of NULL 

to nullptr, I've corrected a small number where it seemed clear
that the previous NULL should have been either "NULL" (where the
code is looking for a string with that value),  or null char / null byte
(where the comment is talking about the char/byte that terminates
a c-style string).

Also changed 6 places where the batch change had changed 'NULL ptr'
to 'nullptr ptr'. Now they simply say 'nullptr'.
parent 96f0e7e0

src/GPU/pair_eam_alloy_gpu.cpp

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ void PairEAMAlloyGPU::coeff(int narg, char **arg) 
  read_file(arg[2]);



  // read args that map atom types to elements in potential file

  // map[i] = which element the Ith atom type is, -1 if nullptr

  // map[i] = which element the Ith atom type is, -1 if "NULL"



  for (i = 3; i < narg; i++) {

    if (strcmp(arg[i],"NULL") == 0) {

src/GPU/pair_eam_fs_gpu.cpp

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ void PairEAMFSGPU::coeff(int narg, char **arg) 
  read_file(arg[2]);



  // read args that map atom types to elements in potential file

  // map[i] = which element the Ith atom type is, -1 if nullptr

  // map[i] = which element the Ith atom type is, -1 if "NULL"



  for (i = 3; i < narg; i++) {

    if (strcmp(arg[i],"NULL") == 0) {

src/KOKKOS/pair_eam_alloy_kokkos.cpp

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ void PairEAMAlloyKokkos<DeviceType>::coeff(int narg, char **arg) 
  read_file(arg[2]);



  // read args that map atom types to elements in potential file

  // map[i] = which element the Ith atom type is, -1 if nullptr

  // map[i] = which element the Ith atom type is, -1 if "NULL"



  for (i = 3; i < narg; i++) {

    if (strcmp(arg[i],"NULL") == 0) {

src/KOKKOS/pair_eam_fs_kokkos.cpp

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ void PairEAMFSKokkos<DeviceType>::coeff(int narg, char **arg) 
  read_file(arg[2]);



  // read args that map atom types to elements in potential file

  // map[i] = which element the Ith atom type is, -1 if nullptr

  // map[i] = which element the Ith atom type is, -1 if "NULL"



  for (i = 3; i < narg; i++) {

    if (strcmp(arg[i],"NULL") == 0) {

src/MANYBODY/pair_adp.cpp

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ void PairADP::coeff(int narg, char **arg) 
  read_file(arg[2]);



  // read args that map atom types to elements in potential file

  // map[i] = which element the Ith atom type is, -1 if nullptr

  // map[i] = which element the Ith atom type is, -1 if "NULL"



  for (i = 3; i < narg; i++) {

    if (strcmp(arg[i],"NULL") == 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE