jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix whitespace

This commit is contained in:
Richard Berger 2020-05-29 17:25:41 -04:00
parent 447784212a
commit 636a1bffe3
No known key found for this signature in database
GPG Key ID: A9E83994E0BA0CAB
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/KOKKOS/pair_eam_fs_kokkos.cpp
View File

@ -1010,7 +1010,7 @@ void PairEAMFSKokkos<DeviceType>::read_file(char *filename)
strcpy(file->elements[i], word.c_str()); strcpy(file->elements[i], word.c_str());
} }
// //
line = reader.next_line(5); line = reader.next_line(5);
values = ValueTokenizer(line); values = ValueTokenizer(line);
@ -1022,7 +1022,7 @@ void PairEAMFSKokkos<DeviceType>::read_file(char *filename)
if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0)) if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0))
error->one(FLERR,"Invalid EAM potential file"); error->one(FLERR,"Invalid EAM potential file");
memory->create(file->mass, file->nelements, "pair:mass"); memory->create(file->mass, file->nelements, "pair:mass");
memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho"); memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho");
memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor"); memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor");

6
src/MANYBODY/pair_eim.cpp
View File

@ -1049,7 +1049,7 @@ double PairEIM::memory_usage()
return bytes; return bytes;
} }
EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS * lmp, const std::string & filename) : EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS * lmp, const std::string & filename) :
Pointers(lmp), filename(filename) Pointers(lmp), filename(filename)
{ {
if (comm->me != 0) { if (comm->me != 0) {
@ -1065,7 +1065,7 @@ EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS * lmp, const std::string &
} }
parse(fp); parse(fp);
fclose(fp); fclose(fp);
} }
@ -1115,7 +1115,7 @@ char * EIMPotentialFileReader::next_line(FILE * fp) {
// strip comment // strip comment
if ((ptr = strchr(line, '#'))) *ptr = '\0'; if ((ptr = strchr(line, '#'))) *ptr = '\0';
// strip ampersand // strip ampersand
if ((ptr = strrchr(line, '&'))) { if ((ptr = strrchr(line, '&'))) {
concat = true; concat = true;

4
src/MANYBODY/pair_polymorphic.cpp
View File

@ -573,12 +573,12 @@ void PairPolymorphic::read_file(char *file)
char * line = reader->next_line(2); char * line = reader->next_line(2);
ValueTokenizer values(line); ValueTokenizer values(line);
int ntypes = values.next_int(); int ntypes = values.next_int();
if (ntypes != nelements) if (ntypes != nelements)
error->one(FLERR,"Incorrect number of elements in potential file"); error->one(FLERR,"Incorrect number of elements in potential file");
eta = values.next_int(); eta = values.next_int();
// map the elements in the potential file to LAMMPS atom types // map the elements in the potential file to LAMMPS atom types

2
src/MANYBODY/pair_tersoff.h
View File

@ -37,7 +37,7 @@ class PairTersoff : public Pair {
static const int NPARAMS_PER_LINE = 17; static const int NPARAMS_PER_LINE = 17;
protected: protected:
struct Param { struct Param {
double lam1,lam2,lam3; double lam1,lam2,lam3;
double c,d,h; double c,d,h;

4
src/USER-INTEL/pair_eam_fs_intel.cpp
View File

@ -144,7 +144,7 @@ void PairEAMFSIntel::read_file(char *filename)
strcpy(file->elements[i], word.c_str()); strcpy(file->elements[i], word.c_str());
} }
// //
line = reader.next_line(5); line = reader.next_line(5);
values = ValueTokenizer(line); values = ValueTokenizer(line);
@ -156,7 +156,7 @@ void PairEAMFSIntel::read_file(char *filename)
if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0)) if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0))
error->one(FLERR,"Invalid EAM potential file"); error->one(FLERR,"Invalid EAM potential file");
memory->create(file->mass, file->nelements, "pair:mass"); memory->create(file->mass, file->nelements, "pair:mass");
memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho"); memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho");
memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor"); memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor");

4
src/USER-OMP/pair_eam_fs_omp.cpp
View File

@ -144,7 +144,7 @@ void PairEAMFSOMP::read_file(char *filename)
strcpy(file->elements[i], word.c_str()); strcpy(file->elements[i], word.c_str());
} }
// //
line = reader.next_line(5); line = reader.next_line(5);
values = ValueTokenizer(line); values = ValueTokenizer(line);
@ -156,7 +156,7 @@ void PairEAMFSOMP::read_file(char *filename)
if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0)) if ((file->nrho <= 0) || (file->nr <= 0) || (file->dr <= 0.0))
error->one(FLERR,"Invalid EAM potential file"); error->one(FLERR,"Invalid EAM potential file");
memory->create(file->mass, file->nelements, "pair:mass"); memory->create(file->mass, file->nelements, "pair:mass");
memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho"); memory->create(file->frho, file->nelements, file->nrho + 1, "pair:frho");
memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor"); memory->create(file->rhor, file->nelements, file->nelements, file->nr + 1, "pair:rhor");

2
src/tokenizer.h
View File

@ -82,7 +82,7 @@ public:
bool has_next() const; bool has_next() const;
void skip(int ntokens); void skip(int ntokens);
const size_t count() const; const size_t count() const;
}; };

2
src/utils.h
View File

@ -126,7 +126,7 @@ namespace LAMMPS_NS {
*/ */
tagint tnumeric(const char *file, int line, const char *str, tagint tnumeric(const char *file, int line, const char *str,
bool do_abort, LAMMPS *lmp); bool do_abort, LAMMPS *lmp);
/** /**
* \brief Trim anything from '#' onward * \brief Trim anything from '#' onward