From 6370b362c77ae9c5f9aa64e11eae3941438b5359 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <drewej@protonmail.com>
Date: Thu, 20 Jun 2019 14:43:33 -0500
Subject: [PATCH 1/2] Check that hdf5 has MPI if performing depletion with MPI

Check added in openmc/depletion/__init__.py.
Without this check, the exporting of the Results to hdf5 will
hang, as the second process attempts to write to a file
that has already been opened on another process.
This error is only raised after a full transport calculation
has been run.
The check raises a more helpful error directly at the import
from openmc.deplete, prior to transport calculations.
---
 openmc/deplete/__init__.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/openmc/deplete/__init__.py b/openmc/deplete/__init__.py
index e49c4e69cf..505f79e6dd 100644
--- a/openmc/deplete/__init__.py
+++ b/openmc/deplete/__init__.py
@@ -6,10 +6,24 @@ A depletion front-end tool.
 """
 
 from .dummy_comm import DummyCommunicator
+
 try:
     from mpi4py import MPI
+
     comm = MPI.COMM_WORLD
     have_mpi = True
+    # check if running with MPI and if hdf5 is MPI-enabled
+    from h5py import get_config
+
+    if not get_config().mpi and comm.size > 1:
+        # Raise exception only on process 0
+        if comm.rank:
+            from sys import exit
+
+            exit()
+        raise RuntimeError(
+            "Need MPI-enabled HDF5 install to perform depletion with MPI"
+        )
 except ImportError:
     comm = DummyCommunicator()
     have_mpi = False

From 830c0237a842a40c22b82e29e42f8bc32556fefa Mon Sep 17 00:00:00 2001
From: Andrew Johnson <drewej@protonmail.com>
Date: Tue, 25 Jun 2019 13:26:01 -0500
Subject: [PATCH 2/2] Clean up imports in openmc/deplete/__init__.py

---
 openmc/deplete/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openmc/deplete/__init__.py b/openmc/deplete/__init__.py
index 505f79e6dd..721bd636cc 100644
--- a/openmc/deplete/__init__.py
+++ b/openmc/deplete/__init__.py
@@ -4,6 +4,9 @@ openmc.deplete
 
 A depletion front-end tool.
 """
+from sys import exit
+
+from h5py import get_config
 
 from .dummy_comm import DummyCommunicator
 
@@ -12,17 +15,14 @@ try:
 
     comm = MPI.COMM_WORLD
     have_mpi = True
-    # check if running with MPI and if hdf5 is MPI-enabled
-    from h5py import get_config
+    # check if running with MPI and if using parallel HDF5
 
     if not get_config().mpi and comm.size > 1:
         # Raise exception only on process 0
         if comm.rank:
-            from sys import exit
-
             exit()
         raise RuntimeError(
-            "Need MPI-enabled HDF5 install to perform depletion with MPI"
+            "Need parallel HDF5 installed to perform depletion with MPI"
         )
 except ImportError:
     comm = DummyCommunicator()