Merge remote-tracking branch 'origin/master' into refactor-table-reading

2020-06-05 12:09:57 -04:00
parent cd08dc8425 863828540a
commit 7df387f7d5
65 changed files with 647 additions and 837 deletions
--- a/src/potential_file_reader.cpp
+++ b/src/potential_file_reader.cpp
@ -43,7 +43,7 @@ PotentialFileReader::PotentialFileReader(LAMMPS *lmp,
  try {
    reader = open_potential(filename);
    if(!reader) {
-      error->one(FLERR, fmt::format("cannot open {} potential file {}", potential_name, filename).c_str());
+      error->one(FLERR, fmt::format("cannot open {} potential file {}", potential_name, filename));
    }
  } catch (FileReaderException & e) {
    error->one(FLERR, e.what());