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

NULL -> nullptr, and coding style updates

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-07-03 15:50:09 -04:00
parent 3b480397d1
commit 9996d7eaad
3 changed files with 180 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ML-RANN/pair_rann.cpp
View File

@ -81,8 +81,8 @@ PairRANN::PairRANN(LAMMPS *lmp) : Pair(lmp)
manybody_flag = 1;
allocated = 0;
nelements = -1;
elements = NULL;
mass = NULL;
elements = nullptr;
mass = nullptr;
// set comm size needed by this Pair
// comm unused for now.
@ -304,7 +304,7 @@ void PairRANN::read_file(char *filename)
while (eof == 0) {
ptr=fgets(linetemp,longline,fp);
linenum++;
if (ptr == NULL) {
if (ptr == nullptr) {
if (check_potential()) {
error->one(FLERR,"Invalid syntax in potential file, values are inconsistent or missing");
}
@ -345,7 +345,7 @@ void PairRANN::read_file(char *filename)
strtemp=utils::trim_comment(linetemp);
linenum++;
}
if (ptr == NULL) {
if (ptr == nullptr) {
if (check_potential()) {
error->one(FLERR,"Invalid syntax in potential file, values are inconsistent or missing");
}
@ -532,7 +532,7 @@ void PairRANN::read_weight(std::vector<std::string> line,std::vector<std::string
(*linenum)++;
Tokenizer values1 = Tokenizer(linetemp,": ,\t_\n");
line1 = values1.as_vector();
if (ptr==NULL)error->one(filename,*linenum,"unexpected end of potential file!");
if (ptr==nullptr)error->one(filename,*linenum,"unexpected end of potential file!");
nwords = line1.size();
if (nwords != net[l].dimensions[i])error->one(filename,*linenum,"invalid weights per line");
for (k=0;k<net[l].dimensions[i];k++) {
@ -575,7 +575,7 @@ void PairRANN::read_activation_functions(std::vector<std::string> line,std::vect
for (l=0;l<nelements;l++) {
if (line[1].compare(elements[l])==0) {
if (net[l].layers==0)error->one(filename,linenum-1,"networklayers must be defined before activation functions.");
i = strtol(line[2].c_str(),NULL,10);
i = strtol(line[2].c_str(),nullptr,10);
if (i>=net[l].layers || i<0)error->one(filename,linenum-1,"invalid activation layer");
delete activation[l][i];
activation[l][i]=create_activation(line1[0].c_str());
@ -1232,10 +1232,8 @@ RANN::Fingerprint *PairRANN::create_fingerprint(const char *style)
else if (strcmp(style,"bondspin")==0) {
return new RANN::Fingerprint_bondspin(this);
}
char str[128];
sprintf(str,"Unknown fingerprint style %s",style);
error->one(FLERR,str);
return NULL;
error->one(FLERR,"Unknown fingerprint style {}",style);
return nullptr;
}
@ -1247,9 +1245,7 @@ RANN::Activation *PairRANN::create_activation(const char *style)
else if (strcmp(style,"sigI")==0) {
return new RANN::Activation_sigI(this);
}
char str[128];
sprintf(str,"Unknown activation style %s",style);
error->one(FLERR,str);
return NULL;
error->one(FLERR,"Unknown activation style {}",style);
return nullptr;
}

3
src/USER-MISC/pair_wf_cut.cpp
View File

@ -15,6 +15,7 @@
/* ----------------------------------------------------------------------
Contributing Author: Xipeng Wang, Simon Ramirez-Hinestrosa
------------------------------------------------------------------------- */
#include "pair_wf_cut.h"
#include "atom.h"
@ -391,5 +392,5 @@ void *PairWFCut::extract(const char *str, int &dim)
if (strcmp(str,"sigma") == 0) return (void *) sigma;
if (strcmp(str,"nu") == 0) return (void *) nu;
if (strcmp(str,"mu") == 0) return (void *) mu;
return NULL;
return nullptr;
}

202
src/compute_property_local.cpp
View File

@ -1,4 +1,3 @@
// clang-format off
/* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
https://www.lammps.org/, Sandia National Laboratories
@ -13,17 +12,19 @@
------------------------------------------------------------------------- */
#include "compute_property_local.h"
#include <cstring>
#include "atom.h"
#include "atom_vec.h"
#include "update.h"
#include "force.h"
#include "pair.h"
#include "neighbor.h"
#include "neigh_request.h"
#include "neigh_list.h"
#include "memory.h"
#include "error.h"
#include "force.h"
#include "memory.h"
#include "neigh_list.h"
#include "neigh_request.h"
#include "neighbor.h"
#include "pair.h"
#include "update.h"
#include <cstring>
using namespace LAMMPS_NS;
@ -35,8 +36,8 @@ enum{TYPE,RADIUS};
/* ---------------------------------------------------------------------- */
ComputePropertyLocal::ComputePropertyLocal(LAMMPS *lmp, int narg, char **arg) :
Compute(lmp, narg, arg),
vlocal(NULL), alocal(NULL), indices(NULL), pack_choice(NULL)
Compute(lmp, narg, arg), vlocal(nullptr), alocal(nullptr), indices(nullptr),
pack_choice(nullptr)
{
if (narg < 4) error->all(FLERR, "Illegal compute property/local command");
@ -55,167 +56,145 @@ ComputePropertyLocal::ComputePropertyLocal(LAMMPS *lmp, int narg, char **arg) :
if (strcmp(arg[iarg], "natom1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_patom1;
if (kindflag != NONE && kindflag != NEIGH)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = NEIGH;
} else if (strcmp(arg[iarg], "natom2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_patom2;
if (kindflag != NONE && kindflag != NEIGH)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = NEIGH;
} else if (strcmp(arg[iarg], "ntype1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_ptype1;
if (kindflag != NONE && kindflag != NEIGH)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = NEIGH;
} else if (strcmp(arg[iarg], "ntype2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_ptype2;
if (kindflag != NONE && kindflag != NEIGH)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = NEIGH;
} else if (strcmp(arg[iarg], "patom1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_patom1;
if (kindflag != NONE && kindflag != PAIR)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = PAIR;
} else if (strcmp(arg[iarg], "patom2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_patom2;
if (kindflag != NONE && kindflag != PAIR)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = PAIR;
} else if (strcmp(arg[iarg], "ptype1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_ptype1;
if (kindflag != NONE && kindflag != PAIR)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = PAIR;
} else if (strcmp(arg[iarg], "ptype2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_ptype2;
if (kindflag != NONE && kindflag != PAIR)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = PAIR;
} else if (strcmp(arg[iarg], "batom1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_batom1;
if (kindflag != NONE && kindflag != BOND)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = BOND;
} else if (strcmp(arg[iarg], "batom2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_batom2;
if (kindflag != NONE && kindflag != BOND)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = BOND;
} else if (strcmp(arg[iarg], "btype") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_btype;
if (kindflag != NONE && kindflag != BOND)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = BOND;
} else if (strcmp(arg[iarg], "aatom1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_aatom1;
if (kindflag != NONE && kindflag != ANGLE)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = ANGLE;
} else if (strcmp(arg[iarg], "aatom2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_aatom2;
if (kindflag != NONE && kindflag != ANGLE)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = ANGLE;
} else if (strcmp(arg[iarg], "aatom3") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_aatom3;
if (kindflag != NONE && kindflag != ANGLE)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = ANGLE;
} else if (strcmp(arg[iarg], "atype") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_atype;
if (kindflag != NONE && kindflag != ANGLE)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = ANGLE;
} else if (strcmp(arg[iarg], "datom1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_datom1;
if (kindflag != NONE && kindflag != DIHEDRAL)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = DIHEDRAL;
} else if (strcmp(arg[iarg], "datom2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_datom2;
if (kindflag != NONE && kindflag != DIHEDRAL)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = DIHEDRAL;
} else if (strcmp(arg[iarg], "datom3") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_datom3;
if (kindflag != NONE && kindflag != DIHEDRAL)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = DIHEDRAL;
} else if (strcmp(arg[iarg], "datom4") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_datom4;
if (kindflag != NONE && kindflag != DIHEDRAL)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = DIHEDRAL;
} else if (strcmp(arg[iarg], "dtype") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_dtype;
if (kindflag != NONE && kindflag != DIHEDRAL)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = DIHEDRAL;
} else if (strcmp(arg[iarg], "iatom1") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_iatom1;
if (kindflag != NONE && kindflag != IMPROPER)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = IMPROPER;
} else if (strcmp(arg[iarg], "iatom2") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_iatom2;
if (kindflag != NONE && kindflag != IMPROPER)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = IMPROPER;
} else if (strcmp(arg[iarg], "iatom3") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_iatom3;
if (kindflag != NONE && kindflag != IMPROPER)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = IMPROPER;
} else if (strcmp(arg[iarg], "iatom4") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_iatom4;
if (kindflag != NONE && kindflag != IMPROPER)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = IMPROPER;
} else if (strcmp(arg[iarg], "itype") == 0) {
pack_choice[i] = &ComputePropertyLocal::pack_itype;
if (kindflag != NONE && kindflag != IMPROPER)
error->all(FLERR,
"Compute property/local cannot use these inputs together");
error->all(FLERR, "Compute property/local cannot use these inputs together");
kindflag = IMPROPER;
} else break;
} else
break;
nvalues++;
iarg++;
}
if (nvalues == 1) size_local_cols = 0;
else size_local_cols = nvalues;
if (nvalues == 1)
size_local_cols = 0;
else
size_local_cols = nvalues;
// optional args
@ -223,40 +202,40 @@ ComputePropertyLocal::ComputePropertyLocal(LAMMPS *lmp, int narg, char **arg) :
while (iarg < narg) {
if (strcmp(arg[iarg], "cutoff") == 0) {
if (iarg+2 > narg)
if (iarg + 2 > narg) error->all(FLERR, "Illegal compute property/local command");
if (strcmp(arg[iarg + 1], "type") == 0)
cutstyle = TYPE;
else if (strcmp(arg[iarg + 1], "radius") == 0)
cutstyle = RADIUS;
else
error->all(FLERR, "Illegal compute property/local command");
if (strcmp(arg[iarg+1],"type") == 0) cutstyle = TYPE;
else if (strcmp(arg[iarg+1],"radius") == 0) cutstyle = RADIUS;
else error->all(FLERR,"Illegal compute property/local command");
iarg += 2;
} else error->all(FLERR,"Illegal compute property/local command");
} else
error->all(FLERR, "Illegal compute property/local command");
}
// error check
if (atom->molecular == 2 && (kindflag == BOND || kindflag == ANGLE ||
kindflag == DIHEDRAL || kindflag == IMPROPER))
error->all(FLERR,"Compute property/local does not (yet) work "
if (atom->molecular == 2 &&
(kindflag == BOND || kindflag == ANGLE || kindflag == DIHEDRAL || kindflag == IMPROPER))
error->all(FLERR,
"Compute property/local does not (yet) work "
"with atom_style template");
if (kindflag == BOND && atom->avec->bonds_allow == 0)
error->all(FLERR,
"Compute property/local for property that isn't allocated");
error->all(FLERR, "Compute property/local for property that isn't allocated");
if (kindflag == ANGLE && atom->avec->angles_allow == 0)
error->all(FLERR,
"Compute property/local for property that isn't allocated");
error->all(FLERR, "Compute property/local for property that isn't allocated");
if (kindflag == DIHEDRAL && atom->avec->dihedrals_allow == 0)
error->all(FLERR,
"Compute property/local for property that isn't allocated");
error->all(FLERR, "Compute property/local for property that isn't allocated");
if (kindflag == IMPROPER && atom->avec->impropers_allow == 0)
error->all(FLERR,
"Compute property/local for property that isn't allocated");
error->all(FLERR, "Compute property/local for property that isn't allocated");
if (cutstyle == RADIUS && !atom->radius_flag)
error->all(FLERR, "Compute property/local requires atom attribute radius");
nmax = 0;
vlocal = NULL;
alocal = NULL;
vlocal = nullptr;
alocal = nullptr;
}
/* ---------------------------------------------------------------------- */
@ -274,7 +253,7 @@ ComputePropertyLocal::~ComputePropertyLocal()
void ComputePropertyLocal::init()
{
if (kindflag == NEIGH || kindflag == PAIR) {
if (force->pair == NULL)
if (force->pair == nullptr)
error->all(FLERR, "No pair style is defined for compute property/local");
if (force->pair->single_enable == 0)
error->all(FLERR, "Pair style does not support compute property/local");
@ -296,12 +275,18 @@ void ComputePropertyLocal::init()
// do initial memory allocation so that memory_usage() is correct
// cannot be done yet for NEIGH/PAIR, since neigh list does not exist
if (kindflag == NEIGH) ncount = 0;
else if (kindflag == PAIR) ncount = 0;
else if (kindflag == BOND) ncount = count_bonds(0);
else if (kindflag == ANGLE) ncount = count_angles(0);
else if (kindflag == DIHEDRAL) ncount = count_dihedrals(0);
else if (kindflag == IMPROPER) ncount = count_impropers(0);
if (kindflag == NEIGH)
ncount = 0;
else if (kindflag == PAIR)
ncount = 0;
else if (kindflag == BOND)
ncount = count_bonds(0);
else if (kindflag == ANGLE)
ncount = count_angles(0);
else if (kindflag == DIHEDRAL)
ncount = count_dihedrals(0);
else if (kindflag == IMPROPER)
ncount = count_impropers(0);
if (ncount > nmax) reallocate(ncount);
size_local_rows = ncount;
@ -322,22 +307,34 @@ void ComputePropertyLocal::compute_local()
// count local entries and generate list of indices
if (kindflag == NEIGH) ncount = count_pairs(0,0);
else if (kindflag == PAIR) ncount = count_pairs(0,1);
else if (kindflag == BOND) ncount = count_bonds(0);
else if (kindflag == ANGLE) ncount = count_angles(0);
else if (kindflag == DIHEDRAL) ncount = count_dihedrals(0);
else if (kindflag == IMPROPER) ncount = count_impropers(0);
if (kindflag == NEIGH)
ncount = count_pairs(0, 0);
else if (kindflag == PAIR)
ncount = count_pairs(0, 1);
else if (kindflag == BOND)
ncount = count_bonds(0);
else if (kindflag == ANGLE)
ncount = count_angles(0);
else if (kindflag == DIHEDRAL)
ncount = count_dihedrals(0);
else if (kindflag == IMPROPER)
ncount = count_impropers(0);
if (ncount > nmax) reallocate(ncount);
size_local_rows = ncount;
if (kindflag == NEIGH) ncount = count_pairs(1,0);
else if (kindflag == PAIR) ncount = count_pairs(1,1);
else if (kindflag == BOND) ncount = count_bonds(1);
else if (kindflag == ANGLE) ncount = count_angles(1);
else if (kindflag == DIHEDRAL) ncount = count_dihedrals(1);
else if (kindflag == IMPROPER) ncount = count_impropers(1);
if (kindflag == NEIGH)
ncount = count_pairs(1, 0);
else if (kindflag == PAIR)
ncount = count_pairs(1, 1);
else if (kindflag == BOND)
ncount = count_bonds(1);
else if (kindflag == ANGLE)
ncount = count_angles(1);
else if (kindflag == DIHEDRAL)
ncount = count_dihedrals(1);
else if (kindflag == IMPROPER)
ncount = count_impropers(1);
// fill vector or array with local values
@ -346,8 +343,7 @@ void ComputePropertyLocal::compute_local()
(this->*pack_choice[0])(0);
} else {
if (alocal) buf = &alocal[0][0];
for (int n = 0; n < nvalues; n++)
(this->*pack_choice[n])(n);
for (int n = 0; n < nvalues; n++) (this->*pack_choice[n])(n);
}
}