enable and apply clang-format

This commit is contained in:
Axel Kohlmeyer
2024-09-21 12:12:27 -04:00
parent 29fce19c19
commit d16d744550

View File

@ -1,4 +1,3 @@
// clang-format off
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
https://www.lammps.org/, Sandia National Laboratories https://www.lammps.org/, Sandia National Laboratories
@ -66,8 +65,7 @@ int ReaderXYZ::read_time(bigint &ntimestep)
} }
} }
natoms = utils::bnumeric(FLERR, line, false, lmp); natoms = utils::bnumeric(FLERR, line, false, lmp);
if (natoms < 1) if (natoms < 1) error->one(FLERR, "Dump file is incorrectly formatted");
error->one(FLERR,"Dump file is incorrectly formatted");
// skip over comment/title line // skip over comment/title line
@ -116,10 +114,9 @@ void ReaderXYZ::skip()
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
bigint ReaderXYZ::read_header(double /*box*/[3][3], int &boxinfo, int & /*triclinic*/, bigint ReaderXYZ::read_header(double /*box*/[3][3], int &boxinfo, int & /*triclinic*/,
int fieldinfo, int nfield, int fieldinfo, int nfield, int *fieldtype, char ** /*fieldlabel*/,
int *fieldtype, char **/*fieldlabel*/, int scaleflag, int wrapflag, int &fieldflag, int &xflag, int &yflag,
int scaleflag, int wrapflag, int &fieldflag, int &zflag)
int &xflag, int &yflag, int &zflag)
{ {
nid = 0; nid = 0;
@ -145,10 +142,7 @@ bigint ReaderXYZ::read_header(double /*box*/[3][3], int &boxinfo, int &/*triclin
fieldflag = 0; fieldflag = 0;
for (int i = 0; i < nfield; i++) { for (int i = 0; i < nfield; i++) {
if ( (fieldtype[i] == X) || if ((fieldtype[i] == X) || (fieldtype[i] == Y) || (fieldtype[i] == Z) || (fieldtype[i] == ID) ||
(fieldtype[i] == Y) ||
(fieldtype[i] == Z) ||
(fieldtype[i] == ID) ||
(fieldtype[i] == TYPE)) { (fieldtype[i] == TYPE)) {
fieldindex[i] = fieldtype[i]; fieldindex[i] = fieldtype[i];
} else { } else {