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

Conflicts:
	CMakeLists.txt (version bump ignored)

Change-Id: I4ba0209b5f69b6470470530662a0b27390a02771

diff --git a/src/gromacs/mdlib/pme.c b/src/gromacs/mdlib/pme.c
index 2b2a5c0b19784250629f983ac2e386642135b2f3..532fa3a170e91d0fbca6bfd5b7d3179e16ca2edc 100644 (file)
--- a/src/gromacs/mdlib/pme.c
+++ b/src/gromacs/mdlib/pme.c
@@ -3987,7 +3987,8 @@ reduce_threadgrid_overlap(gmx_pme_t pme,
                     if (bCommY)
                     {
                         commbuf = commbuf_y;
-                        buf_my  = ty1 - offy;
+                        /* The y-size of the communication buffer is order-1 */
+                        buf_my  = pmegrid->order - 1;
                         if (bCommX)
                         {
                             /* We index commbuf modulo the local grid size */