Merge release-4-6 into release-5-0

Change-Id: I89230f8a117d9636570e573b7b2657c79aea51c0

diff --git a/src/external/thread_mpi/include/thread_mpi/atomic.h b/src/external/thread_mpi/include/thread_mpi/atomic.h
index 5aa81630f68651bba660b80dcb74f5b94c31644e..895db00ff43300d89488860a71b23d2ae9151643 100644 (file)
--- a/src/external/thread_mpi/include/thread_mpi/atomic.h
+++ b/src/external/thread_mpi/include/thread_mpi/atomic.h
@@ -116,7 +116,7 @@ extern "C"
 #endif
 
 /* now check specifically for several architectures: */
-#if ((defined(i386) || defined(__x86_64__)) && !defined(__OPEN64__))
+#if ((defined(__i386__) || defined(__x86_64__)) && !defined(__OPEN64__))
 /* first x86: */
 #include "atomic/gcc_x86.h"
 

diff --git a/src/gromacs/gmxana/gmx_current.c b/src/gromacs/gmxana/gmx_current.c
index ec1a988f5d85c8713b2ca3580f575d0be8be1b03..94b6d94db2bc29fa412aceabf80cb3a0f39edab3 100644 (file)
--- a/src/gromacs/gmxana/gmx_current.c
+++ b/src/gromacs/gmxana/gmx_current.c
@@ -725,7 +725,7 @@ static void dielectric(FILE *fmj, FILE *fmd, FILE *outf, FILE *fcur, FILE *mcor,
 
 
 
-    if (bACF)
+    if (bACF && (ii < nvfr))
     {
         fprintf(stderr, "Integral and integrated fit to the current acf yields at t=%f:\n", time[vfr[ii]]);
         fprintf(stderr, "sigma=%8.3f (pure integral: %.3f)\n", sgk-malt*pow(time[vfr[ii]], sigma), sgk);
@@ -760,7 +760,7 @@ static void dielectric(FILE *fmj, FILE *fmd, FILE *outf, FILE *fcur, FILE *mcor,
     }
     else
     {
-        fprintf(stderr, "Too less points for a fit.\n");
+        fprintf(stderr, "Too few points for a fit.\n");
     }