mirror of
https://github.com/openmc-dev/openmc.git
synced 2026-07-28 14:15:42 -04:00
Merge pull request #1565 from paulromano/various-fixes
Parallel depletion fix (and other assorted fixes)
This commit is contained in:
commit
e8e97e23e1
4 changed files with 8 additions and 6 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 = (
|
||||
|
|
|
|||
4
setup.py
4
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'],
|
||||
},
|
||||
|
|
|
|||
2
vendor/gsl-lite
vendored
2
vendor/gsl-lite
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit a5706326ed116c315c0e12b72ed39439aff2222f
|
||||
Subproject commit 913e86d49c6a1acca980f4e325378f9dc393493a
|
||||
Loading…
Add table
Add a link
Reference in a new issue