From 6d22b30b5c984702c2ec3a7a46cb69c5de3c2359 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Sun, 2 Sep 2018 15:15:28 -0500 Subject: [PATCH] Remove fission energy release-related flag in get-nndc-data. Make sure BREMX.DAT gets installed. --- scripts/openmc-get-nndc-data | 5 ----- setup.py | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/openmc-get-nndc-data b/scripts/openmc-get-nndc-data index a84a9b2820..ff02d3e4c3 100755 --- a/scripts/openmc-get-nndc-data +++ b/scripts/openmc-get-nndc-data @@ -148,16 +148,11 @@ if not response or response.lower().startswith('y'): # get a list of all ACE files ace_files = sorted(glob.glob(os.path.join('nndc', '**', '*.ace*'))) -# Get path to fission energy release data -data_dir = os.path.dirname(sys.modules['openmc.data'].__file__) -fer_file = os.path.join(data_dir, 'fission_Q_data_endfb71.h5') - # Call the ace-to-hdf5 conversion script pwd = os.path.dirname(os.path.realpath(__file__)) ace2hdf5 = os.path.join(pwd, 'openmc-ace-to-hdf5') subprocess.call([ace2hdf5, '-d', 'nndc_hdf5', - '--fission_energy_release', fer_file, '--libver', args.libver] + ace_files) # Generate photo interaction library files diff --git a/setup.py b/setup.py index e04bc82f68..cbf564480f 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ kwargs = { # Data files and librarries 'package_data': { 'openmc.capi': ['libopenmc.{}'.format(suffix)], - 'openmc.data': ['mass.mas12', '*.h5'] + 'openmc.data': ['mass.mas12', 'BREMX.DAT', '*.h5'] }, # Metadata @@ -52,6 +52,7 @@ kwargs = { 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', ], # Required dependencies