Merge release-2019 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / broadcaststructs.cpp

diff --git a/src/gromacs/mdlib/broadcaststructs.cpp b/src/gromacs/mdlib/broadcaststructs.cpp
index eebf97f2f475b3b25f4119fea5597e222b73f7b4..6eb325684e794c5ad1aaa75e125f169bafc5a5b6 100644 (file)
--- a/src/gromacs/mdlib/broadcaststructs.cpp
+++ b/src/gromacs/mdlib/broadcaststructs.cpp
@@ -836,7 +836,10 @@ void bcast_ir_mtop(const t_commrec *cr, t_inputrec *inputrec, gmx_mtop_t *mtop)
     block_bc(cr, mtop->bIntermolecularInteractions);
     if (mtop->bIntermolecularInteractions)
     {
-        mtop->intermolecular_ilist = std::make_unique<InteractionLists>();
+        if (!MASTER(cr))
+        {
+            mtop->intermolecular_ilist = std::make_unique<InteractionLists>();
+        }
         bc_ilists(cr, mtop->intermolecular_ilist.get());
     }