Merge branch 'master' of https://github.com/lammps/lammps into lammps-master

This commit is contained in:
Jacob Gissinger
2021-06-07 22:48:51 -04:00
4175 changed files with 127478 additions and 48418 deletions

View File

@ -1,6 +1,7 @@
// clang-format off
/* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
https://lammps.sandia.gov/, Sandia National Laboratories
https://www.lammps.org/, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov
Copyright (2003) Sandia Corporation. Under the terms of Contract
@ -232,8 +233,8 @@ void WriteRestart::write(std::string file)
fp = fopen(base.c_str(),"wb");
if (fp == nullptr)
error->one(FLERR, fmt::format("Cannot open restart file {}: {}",
base, utils::getsyserror()));
error->one(FLERR, "Cannot open restart file {}: {}",
base, utils::getsyserror());
}
// proc 0 writes magic string, endian flag, numeric version
@ -295,8 +296,8 @@ void WriteRestart::write(std::string file)
if (filewriter) {
fp = fopen(multiname.c_str(),"wb");
if (fp == nullptr)
error->one(FLERR, fmt::format("Cannot open restart file {}: {}",
multiname, utils::getsyserror()));
error->one(FLERR, "Cannot open restart file {}: {}",
multiname, utils::getsyserror());
write_int(PROCSPERFILE,nclusterprocs);
}
}