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

@ -758,7 +758,7 @@ AtomVec *Atom::new_avec(const std::string &style, int trysuffix, int &sflag)
return avec_creator(lmp);
}
error->all(FLERR,utils::check_packages_for_style("atom",style,lmp).c_str());
error->all(FLERR,utils::check_packages_for_style("atom",style,lmp));
return NULL;
}