Merge branch 'master' into acks2_release

2021-09-30 00:26:25 -04:00
parent cbc5a2933a 4d84ceb822
commit 359aa1d805
568 changed files with 4363 additions and 4091 deletions
--- a/src/fix_efield.cpp
+++ b/src/fix_efield.cpp
@ -431,7 +431,7 @@ double FixEfield::memory_usage()
   return energy added by fix
 ------------------------------------------------------------------------- */

-double FixEfield::compute_scalar(void)
+double FixEfield::compute_scalar()
 {
  if (force_flag == 0) {
    MPI_Allreduce(fsum,fsum_all,4,MPI_DOUBLE,MPI_SUM,world);