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

reformat with clang-format

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-07-20 18:31:52 -04:00
parent b9cc8c8d24
commit c19d37990d
2 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/text_file_reader.cpp
View File

@ -1,4 +1,3 @@
// clang-format off
/* -*- c++ -*- ----------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
https://www.lammps.org/, Sandia National Laboratories
@ -41,14 +40,14 @@ using namespace LAMMPS_NS;
* \param filename Name of file to be read
* \param filetype Description of file type for error messages */
TextFileReader::TextFileReader(const std::string &filename, const std::string &filetype)
: filetype(filetype), closefp(true), ignore_comments(true)
TextFileReader::TextFileReader(const std::string &filename, const std::string &filetype) :
filetype(filetype), closefp(true), ignore_comments(true)
{
fp = fopen(filename.c_str(), "r");
if (fp == nullptr) {
throw FileReaderException(fmt::format("cannot open {} file {}: {}",
filetype, filename, utils::getsyserror()));
throw FileReaderException(
fmt::format("cannot open {} file {}: {}", filetype, filename, utils::getsyserror()));
}
}
@ -69,21 +68,23 @@ This function is useful in combination with :cpp:func:`utils::open_potential`.
* \param fp File descriptor of the already opened file
* \param filetype Description of file type for error messages */
TextFileReader::TextFileReader(FILE *fp, const std::string &filetype)
: filetype(filetype), closefp(false), fp(fp), ignore_comments(true)
TextFileReader::TextFileReader(FILE *fp, const std::string &filetype) :
filetype(filetype), closefp(false), fp(fp), ignore_comments(true)
{
if (fp == nullptr) throw FileReaderException("Invalid file descriptor");
}
/** Closes the file */
TextFileReader::~TextFileReader() {
TextFileReader::~TextFileReader()
{
if (closefp) fclose(fp);
}
/** Read the next line and ignore it */
void TextFileReader::skip_line() {
void TextFileReader::skip_line()
{
char *ptr = fgets(line, MAXLINE, fp);
if (ptr == nullptr) {
// EOF
@ -105,7 +106,8 @@ void TextFileReader::skip_line() {
* \param nparams Number of words that must be read. Default: 0
* \return String with the concatenated text */
char *TextFileReader::next_line(int nparams) {
char *TextFileReader::next_line(int nparams)
{
// concatenate lines until have nparams words
int n = 0;
int nwords = 0;
@ -129,7 +131,8 @@ char *TextFileReader::next_line(int nparams) {
if (ptr == nullptr) {
// EOF
if (nwords > 0 && nwords < nparams) {
throw EOFException(fmt::format("Incorrect format in {} file! {}/{} parameters", filetype, nwords, nparams));
throw EOFException(fmt::format("Incorrect format in {} file! {}/{} parameters", filetype,
nwords, nparams));
}
return nullptr;
}
@ -140,9 +143,7 @@ char *TextFileReader::next_line(int nparams) {
nwords += utils::count_words(&line[n]);
// skip line if blank
if (nwords > 0) {
n = strlen(line);
}
if (nwords > 0) { n = strlen(line); }
}
return line;
@ -157,7 +158,8 @@ char *TextFileReader::next_line(int nparams) {
* \param list Pointer to array with suitable storage for *n* doubles
* \param n Number of doubles to be read */
void TextFileReader::next_dvector(double * list, int n) {
void TextFileReader::next_dvector(double *list, int n)
{
int i = 0;
while (i < n) {
char *ptr = next_line();
@ -165,14 +167,13 @@ void TextFileReader::next_dvector(double * list, int n) {
if (ptr == nullptr) {
// EOF
if (i < n) {
throw FileReaderException(fmt::format("Incorrect format in {} file! {}/{} values", filetype, i, n));
throw FileReaderException(
fmt::format("Incorrect format in {} file! {}/{} values", filetype, i, n));
}
}
ValueTokenizer values(line);
while (values.has_next()) {
list[i++] = values.next_double();
}
while (values.has_next()) { list[i++] = values.next_double(); }
}
}
@ -186,9 +187,9 @@ void TextFileReader::next_dvector(double * list, int n) {
* \param separators String with list of separators.
* \return ValueTokenizer object for read in text */
ValueTokenizer TextFileReader::next_values(int nparams, const std::string &separators) {
ValueTokenizer TextFileReader::next_values(int nparams, const std::string &separators)
{
char *ptr = next_line(nparams);
if (ptr == nullptr)
throw EOFException(fmt::format("Missing line in {} file!", filetype));
if (ptr == nullptr) throw EOFException(fmt::format("Missing line in {} file!", filetype));
return ValueTokenizer(line, separators);
}