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

@ -235,7 +235,8 @@ void WriteRestart::write(std::string file)
fp = fopen(base.c_str(),"wb");
if (fp == NULL)
error->one(FLERR,fmt::format("Cannot open restart file {}",base).c_str());
error->one(FLERR, fmt::format("Cannot open restart file {}: {}",
base, utils::getsyserror()));
}
// proc 0 writes magic string, endian flag, numeric version
@ -299,7 +300,8 @@ void WriteRestart::write(std::string file)
if (filewriter) {
fp = fopen(multiname.c_str(),"wb");
if (fp == NULL)
error->one(FLERR,fmt::format("Cannot open restart file {}",multiname).c_str());
error->one(FLERR, fmt::format("Cannot open restart file {}: {}",
multiname, utils::getsyserror()));
write_int(PROCSPERFILE,nclusterprocs);
}
}