From 636a1bffe3a3d3dd69004833d802871deeb9850d Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Fri, 29 May 2020 17:25:41 -0400 Subject: [PATCH] Fix whitespace --- src/KOKKOS/pair_eam_fs_kokkos.cpp | 4 ++-- src/MANYBODY/pair_eim.cpp | 6 +++--- src/MANYBODY/pair_polymorphic.cpp | 4 ++-- src/MANYBODY/pair_tersoff.h | 2 +- src/USER-INTEL/pair_eam_fs_intel.cpp | 4 ++-- src/USER-OMP/pair_eam_fs_omp.cpp | 4 ++-- src/tokenizer.h | 2 +- src/utils.h | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/KOKKOS/pair_eam_fs_kokkos.cpp b/src/KOKKOS/pair_eam_fs_kokkos.cpp index 1e88e4c3cd..ef0ef50319 100644 --- a/src/KOKKOS/pair_eam_fs_kokkos.cpp +++ b/src/KOKKOS/pair_eam_fs_kokkos.cpp @@ -1010,7 +1010,7 @@ void PairEAMFSKokkos::read_file(char *filename) strcpy(file->elements[i], word.c_str()); } - // + // line = reader.next_line(5); values = ValueTokenizer(line); @@ -1022,7 +1022,7 @@ void PairEAMFSKokkos::read_file(char *filename) if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0)) error->one(FLERR,"Invalid EAM potential file"); - + memory->create(file->mass, file->nelements, "pair:mass"); memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho"); memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor"); diff --git a/src/MANYBODY/pair_eim.cpp b/src/MANYBODY/pair_eim.cpp index c814510db1..3e7dc36243 100644 --- a/src/MANYBODY/pair_eim.cpp +++ b/src/MANYBODY/pair_eim.cpp @@ -1049,7 +1049,7 @@ double PairEIM::memory_usage() return bytes; } -EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS * lmp, const std::string & filename) : +EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS * lmp, const std::string & filename) : Pointers(lmp), filename(filename) { if (comm->me != 0) { @@ -1065,7 +1065,7 @@ EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS * lmp, const std::string & } parse(fp); - + fclose(fp); } @@ -1115,7 +1115,7 @@ char * EIMPotentialFileReader::next_line(FILE * fp) { // strip comment if ((ptr = strchr(line, '#'))) *ptr = '\0'; - + // strip ampersand if ((ptr = strrchr(line, '&'))) { concat = true; diff --git a/src/MANYBODY/pair_polymorphic.cpp b/src/MANYBODY/pair_polymorphic.cpp index 97781bfd7f..8a4a169e85 100644 --- a/src/MANYBODY/pair_polymorphic.cpp +++ b/src/MANYBODY/pair_polymorphic.cpp @@ -573,12 +573,12 @@ void PairPolymorphic::read_file(char *file) char * line = reader->next_line(2); ValueTokenizer values(line); - + int ntypes = values.next_int(); if (ntypes != nelements) error->one(FLERR,"Incorrect number of elements in potential file"); - + eta = values.next_int(); // map the elements in the potential file to LAMMPS atom types diff --git a/src/MANYBODY/pair_tersoff.h b/src/MANYBODY/pair_tersoff.h index d4ae28ee6d..8ebbc83544 100644 --- a/src/MANYBODY/pair_tersoff.h +++ b/src/MANYBODY/pair_tersoff.h @@ -37,7 +37,7 @@ class PairTersoff : public Pair { static const int NPARAMS_PER_LINE = 17; protected: - + struct Param { double lam1,lam2,lam3; double c,d,h; diff --git a/src/USER-INTEL/pair_eam_fs_intel.cpp b/src/USER-INTEL/pair_eam_fs_intel.cpp index 4839afed3a..237d534cb7 100644 --- a/src/USER-INTEL/pair_eam_fs_intel.cpp +++ b/src/USER-INTEL/pair_eam_fs_intel.cpp @@ -144,7 +144,7 @@ void PairEAMFSIntel::read_file(char *filename) strcpy(file->elements[i], word.c_str()); } - // + // line = reader.next_line(5); values = ValueTokenizer(line); @@ -156,7 +156,7 @@ void PairEAMFSIntel::read_file(char *filename) if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0)) error->one(FLERR,"Invalid EAM potential file"); - + memory->create(file->mass, file->nelements, "pair:mass"); memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho"); memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor"); diff --git a/src/USER-OMP/pair_eam_fs_omp.cpp b/src/USER-OMP/pair_eam_fs_omp.cpp index 8ff669d314..8a5b76743b 100644 --- a/src/USER-OMP/pair_eam_fs_omp.cpp +++ b/src/USER-OMP/pair_eam_fs_omp.cpp @@ -144,7 +144,7 @@ void PairEAMFSOMP::read_file(char *filename) strcpy(file->elements[i], word.c_str()); } - // + // line = reader.next_line(5); values = ValueTokenizer(line); @@ -156,7 +156,7 @@ void PairEAMFSOMP::read_file(char *filename) if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0)) error->one(FLERR,"Invalid EAM potential file"); - + memory->create(file->mass, file->nelements, "pair:mass"); memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho"); memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor"); diff --git a/src/tokenizer.h b/src/tokenizer.h index 67116885df..5c0afe7c8d 100644 --- a/src/tokenizer.h +++ b/src/tokenizer.h @@ -82,7 +82,7 @@ public: bool has_next() const; void skip(int ntokens); - + const size_t count() const; }; diff --git a/src/utils.h b/src/utils.h index 3c37b18e20..859615f1f0 100644 --- a/src/utils.h +++ b/src/utils.h @@ -126,7 +126,7 @@ namespace LAMMPS_NS { */ tagint tnumeric(const char *file, int line, const char *str, bool do_abort, LAMMPS *lmp); - + /** * \brief Trim anything from '#' onward