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

remove unneeded typecasts and use fmt::print() instead of fprintf()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-07-07 20:53:42 -04:00
parent 4c67822e6b
commit 9a268da7de
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/atom_vec.cpp
View File

@ -1891,17 +1891,17 @@ void AtomVec::write_data(FILE *fp, int n, double **buf)
} }
} else if (datatype == Atom::INT) { } else if (datatype == Atom::INT) {
if (cols == 0) { if (cols == 0) {
fmt::print(fp," {}",(int) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} else { } else {
for (m = 0; m < cols; m++) for (m = 0; m < cols; m++)
fmt::print(fp," {}",(int) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} }
} else if (datatype == Atom::BIGINT) { } else if (datatype == Atom::BIGINT) {
if (cols == 0) { if (cols == 0) {
fmt::print(fp," {}",(bigint) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} else { } else {
for (m = 0; m < cols; m++) for (m = 0; m < cols; m++)
fmt::print(fp," {}",(bigint) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} }
} }
} }
@ -2039,17 +2039,17 @@ void AtomVec::write_vel(FILE *fp, int n, double **buf)
} }
} else if (datatype == Atom::INT) { } else if (datatype == Atom::INT) {
if (cols == 0) { if (cols == 0) {
fmt::print(fp," {}",(int) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} else { } else {
for (m = 0; m < cols; m++) for (m = 0; m < cols; m++)
fmt::print(fp," {}",(int) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} }
} else if (datatype == Atom::BIGINT) { } else if (datatype == Atom::BIGINT) {
if (cols == 0) { if (cols == 0) {
fmt::print(fp," {}",(bigint) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} else { } else {
for (m = 0; m < cols; m++) for (m = 0; m < cols; m++)
fmt::print(fp," {}",(bigint) ubuf(buf[i][j++]).i); fmt::print(fp," {}",ubuf(buf[i][j++]).i);
} }
} }
} }
@ -2110,8 +2110,7 @@ int AtomVec::pack_bond(tagint **buf)
void AtomVec::write_bond(FILE *fp, int n, tagint **buf, int index) void AtomVec::write_bond(FILE *fp, int n, tagint **buf, int index)
{ {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
fprintf(fp,"%d " TAGINT_FORMAT " " TAGINT_FORMAT " " TAGINT_FORMAT "\n", fmt::print(fp,"{} {} {} {}\n",index,buf[i][0],buf[i][1],buf[i][2]);
index,buf[i][0],buf[i][1],buf[i][2]);
index++; index++;
} }
} }
@ -2173,9 +2172,8 @@ int AtomVec::pack_angle(tagint **buf)
void AtomVec::write_angle(FILE *fp, int n, tagint **buf, int index) void AtomVec::write_angle(FILE *fp, int n, tagint **buf, int index)
{ {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
fprintf(fp,"%d " TAGINT_FORMAT " " TAGINT_FORMAT " " fmt::print(fp,"{} {} {} {} {}\n",index,
TAGINT_FORMAT " " TAGINT_FORMAT "\n", buf[i][0],buf[i][1],buf[i][2],buf[i][3]);
index,buf[i][0],buf[i][1],buf[i][2],buf[i][3]);
index++; index++;
} }
} }
@ -2235,9 +2233,8 @@ int AtomVec::pack_dihedral(tagint **buf)
void AtomVec::write_dihedral(FILE *fp, int n, tagint **buf, int index) void AtomVec::write_dihedral(FILE *fp, int n, tagint **buf, int index)
{ {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
fprintf(fp,"%d " TAGINT_FORMAT " " TAGINT_FORMAT " " fmt::print(fp,"{} {} {} {} {} {}\n",index,buf[i][0],
TAGINT_FORMAT " " TAGINT_FORMAT " " TAGINT_FORMAT "\n", buf[i][1],buf[i][2],buf[i][3],buf[i][4]);
index,buf[i][0],buf[i][1],buf[i][2],buf[i][3],buf[i][4]);
index++; index++;
} }
} }
@ -2297,9 +2294,8 @@ int AtomVec::pack_improper(tagint **buf)
void AtomVec::write_improper(FILE *fp, int n, tagint **buf, int index) void AtomVec::write_improper(FILE *fp, int n, tagint **buf, int index)
{ {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
fprintf(fp,"%d " TAGINT_FORMAT " " TAGINT_FORMAT " " fmt::print(fp,"{} {} {} {} {} {}\n",index,buf[i][0],
TAGINT_FORMAT " " TAGINT_FORMAT " " TAGINT_FORMAT "\n", buf[i][1],buf[i][2],buf[i][3],buf[i][4]);
index,buf[i][0],buf[i][1],buf[i][2],buf[i][3],buf[i][4]);
index++; index++;
} }
} }