convert code in Info to use {fmt} and string

This commit is contained in:
Axel Kohlmeyer
2020-06-04 15:21:57 -04:00
parent b27ef02bc2
commit ad15385f4c
3 changed files with 88 additions and 92 deletions

View File

@ -1238,18 +1238,15 @@ void LAMMPS::print_config(FILE *fp)
const char *pkg;
int ncword, ncline = 0;
const char *infobuf = Info::get_os_info();
fprintf(fp,"OS: %s\n\n",infobuf);
delete[] infobuf;
fmt::print(fp,"OS: {}\n\n",Info::get_os_info());
infobuf = Info::get_compiler_info();
fprintf(fp,"Compiler: %s with %s\n",infobuf,Info::get_openmp_info());
delete[] infobuf;
fprintf(fp,"C++ standard: %s\n",Info::get_cxx_info());
fmt::print(fp,"Compiler: {} with {}\nC++ standard: {}\n",
Info::get_compiler_info(),Info::get_openmp_info(),
Info::get_cxx_info());
int major,minor;
infobuf = Info::get_mpi_info(major,minor);
fprintf(fp,"MPI v%d.%d: %s\n\n",major,minor,infobuf);
std::string infobuf = Info::get_mpi_info(major,minor);
fmt::print(fp,"MPI v{}.{}: {}\n\n",major,minor,infobuf);
fputs("Active compile time flags:\n\n",fp);
if (Info::has_gzip_support()) fputs("-DLAMMPS_GZIP\n",fp);
@ -1264,11 +1261,13 @@ void LAMMPS::print_config(FILE *fp)
#else // defined(LAMMPS_SMALLSMALL)
fputs("-DLAMMPS_SMALLSMALL\n",fp);
#endif
fprintf(fp,"\nsizeof(smallint): %3d-bit\n",(int)sizeof(smallint)*8);
fprintf(fp,"sizeof(imageint): %3d-bit\n",(int)sizeof(imageint)*8);
fprintf(fp,"sizeof(tagint): %3d-bit\n",(int)sizeof(tagint)*8);
fprintf(fp,"sizeof(bigint): %3d-bit\n",(int)sizeof(bigint)*8);
fmt::print(fp,"sizeof(smallint): {}-bit\n"
"sizeof(imageint): {}-bit\n"
"sizeof(tagint): {}-bit\n"
"sizeof(bigint): {}-bit\n",
sizeof(smallint)*8, sizeof(imageint)*8,
sizeof(tagint)*8, sizeof(bigint)*8);
fputs("\nInstalled packages:\n\n",fp);
for (int i = 0; NULL != (pkg = installed_packages[i]); ++i) {