Merge branch 'master' into prepare-clang-format

# Conflicts: # src/MOLECULE/bond_fene.h # src/MOLECULE/bond_fene_expand.h
2021-05-11 21:49:48 -04:00
parent d1941392d3 ee546e2fa3
commit d8291eea7b
205 changed files with 16072 additions and 8024 deletions
--- a/src/ntopo_dihedral_partial.cpp
+++ b/src/ntopo_dihedral_partial.cpp
@ -97,6 +97,5 @@ void NTopoDihedralPartial::build()
  int all;
  MPI_Allreduce(&nmissing,&all,1,MPI_INT,MPI_SUM,world);
  if (all && (me == 0))
-    error->warning(FLERR,fmt::format("Dihedral atoms missing at step {}",
-                                     update->ntimestep));
+    error->warning(FLERR,"Dihedral atoms missing at step {}",update->ntimestep);
 }