From 2efc7e8b71606b59708868bbc0e1267856fd6297 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 27 Jun 2019 10:29:56 -0500 Subject: [PATCH] Fix issue with vector proc_time in reading depletion_summary Previous changes made proc_time a vector, not an (N, 1) array. The reading of this data was not updated accordingly, until now --- openmc/deplete/__init__.py | 2 +- openmc/deplete/results.py | 2 +- openmc/deplete/results_list.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openmc/deplete/__init__.py b/openmc/deplete/__init__.py index 0c3a85d071..b5eb2dec2e 100644 --- a/openmc/deplete/__init__.py +++ b/openmc/deplete/__init__.py @@ -8,7 +8,7 @@ from sys import exit from h5py import get_config -from unittest import Mock +from unittest.mock import Mock from .dummy_comm import DummyCommunicator diff --git a/openmc/deplete/results.py b/openmc/deplete/results.py index bdee89b6ca..c61664d42f 100644 --- a/openmc/deplete/results.py +++ b/openmc/deplete/results.py @@ -359,7 +359,7 @@ class Results(object): if "depletion time" in handle: proc_time_dset = handle["/depletion time"] if step < proc_time_dset.shape[0]: - results.proc_time = proc_time_dset[step, :] + results.proc_time = proc_time_dset[step] if results.proc_time is None: results.proc_time = np.array([np.nan]) diff --git a/openmc/deplete/results_list.py b/openmc/deplete/results_list.py index 58dcf0c59d..c5dd1a8926 100644 --- a/openmc/deplete/results_list.py +++ b/openmc/deplete/results_list.py @@ -116,5 +116,5 @@ class ResultsList(list): """ times = np.empty((len(self) - 1, 1)) for ix, res in enumerate(self[:-1]): - times[ix] = res.proc_time[0] + times[ix] = res.proc_time return times