Merge release-4-5-patches into release-4-6

[alexxy/gromacs.git] / include / types / commrec.h

diff --git a/include/types/commrec.h b/include/types/commrec.h
index 8201cf8c44730183d73be42e2d05275ceac5aa73..0d2fce9813e544359fab0a5e5574d324293378db 100644 (file)
--- a/include/types/commrec.h
+++ b/include/types/commrec.h
@@ -38,7 +38,7 @@
 #ifdef GMX_LIB_MPI
 #include <mpi.h>
 #else
-#ifdef GMX_THREADS
+#ifdef GMX_THREAD_MPI
 #include "../thread_mpi/tmpi.h"
 #include "../thread_mpi/mpi_bindings.h"
 #else
@@ -283,11 +283,11 @@ typedef struct {
   mpi_in_place_buf_t *mpb;
 } t_commrec;
 
-#define MASTERNODE(cr)     ((cr)->nodeid == 0)
+#define MASTERNODE(cr)     (((cr)->nodeid == 0) || !PAR(cr))
   /* #define MASTERTHREAD(cr)   ((cr)->threadid == 0) */
   /* #define MASTER(cr)         (MASTERNODE(cr) && MASTERTHREAD(cr)) */
 #define MASTER(cr)         MASTERNODE(cr)
-#define SIMMASTER(cr)      (MASTER(cr) && ((cr)->duty & DUTY_PP))
+#define SIMMASTER(cr)      ((MASTER(cr) && ((cr)->duty & DUTY_PP)) || !PAR(cr))
 #define NODEPAR(cr)        ((cr)->nnodes > 1)
   /* #define THREADPAR(cr)      ((cr)->nthreads > 1) */
   /* #define PAR(cr)            (NODEPAR(cr) || THREADPAR(cr)) */
@@ -295,7 +295,7 @@ typedef struct {
 #define RANK(cr,nodeid)    (nodeid)
 #define MASTERRANK(cr)     (0)
 
-#define DOMAINDECOMP(cr)   ((cr)->dd != NULL)
+#define DOMAINDECOMP(cr)   (((cr)->dd != NULL) && PAR(cr))
 #define DDMASTER(dd)       ((dd)->rank == (dd)->masterrank)
 
 #define PARTDECOMP(cr)     ((cr)->pd != NULL)