Merge branch 'master' into collected-small-changes

src/info.cpp

@@ -16,8 +16,14 @@
                           Richard Berger (Temple U)
 ------------------------------------------------------------------------- */
 
-#include <cstring>
 #include "info.h"
+#include <mpi.h>
+#include <cmath>
+#include <cstring>
+#include <cctype>
+#include <ctime>
+#include <map>
+#include <string>
 #include "accelerator_kokkos.h"
 #include "atom.h"
 #include "comm.h"
@@ -44,18 +50,12 @@
 #include "error.h"
 #include "utils.h"
 
-#include <ctime>
-#include <map>
-#include <string>
-#include <algorithm>
-
 #ifdef _WIN32
 #define PSAPI_VERSION 1
 #include <windows.h>
 #include <stdint.h> // <cstdint> requires C++-11
 #include <psapi.h>
 #else
-#include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
 #endif
@@ -374,7 +374,7 @@ void Info::command(int narg, char **arg)
     if (comm->mode == 0) {
       fprintf(out,"Communication mode = single\n");
       fprintf(out,"Communication cutoff = %g\n",
-              MAX(comm->cutghostuser,neighbor->cutneighmax));
+              comm->get_comm_cutoff());
     }
 
     if (comm->mode == 1) {