Merge branch 'master' into more-fmtlib-and-string

# Conflicts:
#	src/write_restart.cpp
This commit is contained in:
Axel Kohlmeyer
2020-06-05 11:13:44 -04:00
63 changed files with 648 additions and 849 deletions

View File

@ -188,11 +188,9 @@ void WriteData::write(const char *file)
if (me == 0) {
fp = fopen(file,"w");
if (fp == NULL) {
char str[128];
snprintf(str,128,"Cannot open data file %s",file);
error->one(FLERR,str);
}
if (fp == NULL)
error->one(FLERR,fmt::format("Cannot open data file {}: {}",
file, utils::getsyserror()));
}
// proc 0 writes header, ntype-length arrays, force fields