From 319e64d8f3b45c48878d1fc7ebfa2e098cbc2762 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 13 May 2020 16:16:59 -0500 Subject: [PATCH 1/4] Fix make_ace(_thermal) when descriptive data in MF=1,MT=451 is missing --- openmc/data/njoy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmc/data/njoy.py b/openmc/data/njoy.py index 0ef77695b5..be25703422 100644 --- a/openmc/data/njoy.py +++ b/openmc/data/njoy.py @@ -339,7 +339,7 @@ def make_ace(filename, temperatures=None, acer=True, xsdir=None, ev = evaluation if evaluation is not None else endf.Evaluation(filename) mat = ev.material - zsymam = ev.target['zsymam'] + zsymam = ev.target.get('zsymam', 'Unknown') # Determine name of library library = '{}-{}.{}'.format(*ev.info['library']) @@ -499,7 +499,7 @@ def make_ace_thermal(filename, filename_thermal, temperatures=None, ev_thermal = (evaluation_thermal if evaluation_thermal is not None else endf.Evaluation(filename_thermal)) mat_thermal = ev_thermal.material - zsymam_thermal = ev_thermal.target['zsymam'] + zsymam_thermal = ev_thermal.target.get('zsymam', 'Unknown') # Determine name, isotopes based on MAT number data = _get_thermal_data(ev_thermal, mat_thermal) From b4032229cb1c63b5e08814dc73cda41e3208fdfe Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 13 May 2020 16:19:12 -0500 Subject: [PATCH 2/4] Ensure depletion fission yield modes work in parallel --- openmc/deplete/helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmc/deplete/helpers.py b/openmc/deplete/helpers.py index d79a031116..8c17edac8a 100644 --- a/openmc/deplete/helpers.py +++ b/openmc/deplete/helpers.py @@ -444,7 +444,7 @@ class FissionYieldCutoffHelper(TalliedFissionYieldHelper): def unpack(self): """Obtain fast and thermal fission fractions from tally""" - if not self._tally_nucs: + if not self._tally_nucs or self._local_indexes.size == 0: self.results = None return fission_rates = self._fission_rate_tally.results[..., 1].reshape( @@ -605,7 +605,7 @@ class AveragedFissionYieldHelper(TalliedFissionYieldHelper): def unpack(self): """Unpack tallies and populate :attr:`results` with average energies""" - if not self._tally_nucs: + if not self._tally_nucs or self._local_indexes.size == 0: self.results = None return fission_results = ( From a8503d090bb62b84f6e06992c2c8fe307a588bf3 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 13 May 2020 16:20:31 -0500 Subject: [PATCH 3/4] Update gsl-lite submodule (fixes breaking compile with gcc 10) --- vendor/gsl-lite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/gsl-lite b/vendor/gsl-lite index a5706326ed..913e86d49c 160000 --- a/vendor/gsl-lite +++ b/vendor/gsl-lite @@ -1 +1 @@ -Subproject commit a5706326ed116c315c0e12b72ed39439aff2222f +Subproject commit 913e86d49c6a1acca980f4e325378f9dc393493a From 2adff030423c35da4c4a8b012a05729e73dd330f Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 15 May 2020 10:58:00 -0500 Subject: [PATCH 4/4] Include mpi4py as optional dependency in setup.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c193645c35..7e8183b121 100755 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ kwargs = { 'download_url': 'https://github.com/openmc-dev/openmc/releases', 'project_urls': { 'Issue Tracker': 'https://github.com/openmc-dev/openmc/issues', - 'Documentation': 'https://openmc.readthedocs.io', + 'Documentation': 'https://docs.openmc.org', 'Source Code': 'https://github.com/openmc-dev/openmc', }, 'classifiers': [ @@ -59,6 +59,7 @@ kwargs = { 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ], # Dependencies @@ -68,6 +69,7 @@ kwargs = { 'pandas', 'lxml', 'uncertainties' ], 'extras_require': { + 'depletion-mpi': ['mpi4py'], 'test': ['pytest', 'pytest-cov', 'colorama'], 'vtk': ['vtk'], },