From 3246a9320edba7f9b9108dcfadaf3a820343358d Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 9 Nov 2018 16:39:19 -0600 Subject: [PATCH] Remove option to specify multipole library outside of cross_sections.xml --- .travis.yml | 1 - docs/source/devguide/tests.rst | 10 ++--- docs/source/io_formats/materials.rst | 15 -------- docs/source/usersguide/cross_sections.rst | 17 +++----- include/openmc/settings.h | 3 +- man/man1/openmc.1 | 5 --- openmc/material.py | 24 ------------ openmc/settings.py | 1 - scripts/openmc-make-test-data | 47 +++++++++++++++-------- src/cross_sections.cpp | 15 -------- src/input_xml.F90 | 31 +++------------ src/relaxng/materials.rnc | 4 +- src/relaxng/materials.rng | 7 ---- src/settings.F90 | 1 - src/settings.cpp | 21 +--------- tests/regression_tests/diff_tally/test.py | 3 -- tests/regression_tests/multipole/test.py | 3 -- tests/unit_tests/test_data_multipole.py | 16 ++++---- tests/unit_tests/test_material.py | 2 - tests/unit_tests/test_settings.py | 1 - 20 files changed, 57 insertions(+), 170 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4939f807c8..eacf3bb43f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ env: - OMP_NUM_THREADS=2 - OPENMC_CROSS_SECTIONS=$HOME/nndc_hdf5/cross_sections.xml - OPENMC_ENDF_DATA=$HOME/endf-b-vii.1 - - OPENMC_MULTIPOLE_LIBRARY=$HOME/WMP_Library - LD_LIBRARY_PATH=$HOME/MOAB/lib:$HOME/DAGMC/lib - PATH=$PATH:$HOME/NJOY2016/build - DISPLAY=:99.0 diff --git a/docs/source/devguide/tests.rst b/docs/source/devguide/tests.rst index 749737b5cb..475d0f69b3 100644 --- a/docs/source/devguide/tests.rst +++ b/docs/source/devguide/tests.rst @@ -30,11 +30,11 @@ or using pip (recommended):: pip install -e .[test] It is also assumed that you have cross section data available that is pointed to -by the :envvar:`OPENMC_CROSS_SECTIONS` and :envvar:`OPENMC_MULTIPOLE_LIBRARY` -environment variables. Furthermore, to run unit tests for the :mod:`openmc.data` -module, it is necessary to have ENDF/B-VII.1 data available and pointed to by -the :envvar:`OPENMC_ENDF_DATA` environment variable. All data sources can be -obtained using the ``tools/ci/travis-before-script.sh`` script. +by the :envvar:`OPENMC_CROSS_SECTIONS` environment variables. Furthermore, to +run unit tests for the :mod:`openmc.data` module, it is necessary to have +ENDF/B-VII.1 data available and pointed to by the :envvar:`OPENMC_ENDF_DATA` +environment variable. All data sources can be obtained using the +``tools/ci/travis-before-script.sh`` script. To execute the test suite, go to the ``tests/`` directory and run:: diff --git a/docs/source/io_formats/materials.rst b/docs/source/io_formats/materials.rst index 322b9c9994..cd198d0063 100644 --- a/docs/source/io_formats/materials.rst +++ b/docs/source/io_formats/materials.rst @@ -18,21 +18,6 @@ path to the XML cross section listing when in continuous-energy mode, and the :envvar:`OPENMC_MG_CROSS_SECTIONS` environment variable will be used in multi-group mode. -.. _multipole_library: - -------------------------------- -```` Element -------------------------------- - -The ```` element indicates the directory containing a -windowed multipole library. If a windowed multipole library is available, -OpenMC can use it for on-the-fly Doppler-broadening of resolved resonance range -cross sections. If this element is absent from the settings.xml file, the -:envvar:`OPENMC_MULTIPOLE_LIBRARY` environment variable will be used. - - .. note:: The element must also be set to "true" for - windowed multipole functionality. - .. _material: ---------------------- diff --git a/docs/source/usersguide/cross_sections.rst b/docs/source/usersguide/cross_sections.rst index 7e596c72f2..a5adb3dcc0 100644 --- a/docs/source/usersguide/cross_sections.rst +++ b/docs/source/usersguide/cross_sections.rst @@ -41,11 +41,6 @@ following environment variables are used: user has not specified :attr:`Materials.cross_sections` (equivalently, the :ref:`cross_sections` in :ref:`materials.xml `). -:envvar:`OPENMC_MULTIPOLE_LIBRARY` - Indicates the path to a directory containing windowed multipole data if the - user has not specified :attr:`Materials.multipole_library` (equivalently, the - :ref:`multipole_library` in :ref:`materials.xml `) - :envvar:`OPENMC_MG_CROSS_SECTIONS` Indicates the path to the an :ref:`HDF5 file ` that contains multi-group cross sections if the user has not specified @@ -306,12 +301,12 @@ Windowed Multipole Data ----------------------- OpenMC is capable of using windowed multipole data for on-the-fly Doppler -broadening. While such data is not yet available for all nuclides, an -experimental multipole library is available that contains data for 70 -nuclides. To obtain this library, you can run :ref:`scripts_multipole` which -will download and extract it into a ``wmp`` directory. Once the library has been -downloaded, set the :envvar:`OPENMC_MULTIPOLE_LIBRARY` environment variable (or -the :attr:`Materials.multipole_library` attribute) to the ``wmp`` directory. +broadening. A comprehensive multipole data library containing all nuclides in +ENDF/B-VII.1 is available on `GitHub +`_. To obtain this library, download +and unpack an archive (.zip or .tag.gz) from GitHub. Once unpacked, you can use +the :class:`openmc.data.DataLibrary` class to register the .h5 files as +described in :ref:`create_xs_library`. -------------------------- Multi-Group Cross Sections diff --git a/include/openmc/settings.h b/include/openmc/settings.h index 3296c5b20e..06cc1ab907 100644 --- a/include/openmc/settings.h +++ b/include/openmc/settings.h @@ -52,7 +52,6 @@ extern "C" bool dagmc; //!< indicator of DAGMC geometry // Paths to various files extern std::string path_cross_sections; //!< path to cross_sections.xml extern std::string path_input; //!< directory where main .xml files resides -extern std::string path_multipole; //!< directory containing multipole files extern std::string path_output; //!< directory where output files are written extern std::string path_particle_restart; //!< path to a particle restart file extern std::string path_source; @@ -62,7 +61,7 @@ extern std::string path_statepoint; //!< path to a statepoint file extern "C" int32_t index_entropy_mesh; //!< Index of entropy mesh in global mesh array extern "C" int32_t index_ufs_mesh; //!< Index of UFS mesh in global mesh array extern "C" int32_t index_cmfd_mesh; //!< Index of CMFD mesh in global mesh array - + extern "C" int32_t n_batches; //!< number of (inactive+active) batches extern "C" int32_t n_inactive; //!< number of inactive batches extern "C" int32_t gen_per_batch; //!< number of generations per batch diff --git a/man/man1/openmc.1 b/man/man1/openmc.1 index eb5c857f71..f574ea10ae 100644 --- a/man/man1/openmc.1 +++ b/man/man1/openmc.1 @@ -53,11 +53,6 @@ to locate HDF5 format cross section libraries if the user has not specified the Indicates the default path to an HDF5 file that contains multi-group cross section libraries if the user has not specified the tag in .I materials.xml\fP. -.TP -.B OPENMC_MULTIPOLE_LIBRARY -Indicates the default path to a directory containing windowed multipole data if -the user has not specified the tag in -.I materials.xml\fP. .SH LICENSE Copyright \(co 2011-2018 Massachusetts Institute of Technology and OpenMC contributors. diff --git a/openmc/material.py b/openmc/material.py index d11f9de497..612a7dfb6c 100644 --- a/openmc/material.py +++ b/openmc/material.py @@ -989,18 +989,12 @@ class Materials(cv.CheckedList): continuous-energy calculations and :envvar:`OPENMC_MG_CROSS_SECTIONS` will be used for multi-group calculations to find the path to the HDF5 cross section file. - multipole_library : str - Indicates the path to a directory containing a windowed multipole - cross section library. If it is not set, the - :envvar:`OPENMC_MULTIPOLE_LIBRARY` environment variable will be used. A - multipole library is optional. """ def __init__(self, materials=None): super().__init__(Material, 'materials collection') self._cross_sections = None - self._multipole_library = None if materials is not None: self += materials @@ -1009,20 +1003,11 @@ class Materials(cv.CheckedList): def cross_sections(self): return self._cross_sections - @property - def multipole_library(self): - return self._multipole_library - @cross_sections.setter def cross_sections(self, cross_sections): cv.check_type('cross sections', cross_sections, str) self._cross_sections = cross_sections - @multipole_library.setter - def multipole_library(self, multipole_library): - cv.check_type('cross sections', multipole_library, str) - self._multipole_library = multipole_library - def append(self, material): """Append material to collection @@ -1060,11 +1045,6 @@ class Materials(cv.CheckedList): element = ET.SubElement(root_element, "cross_sections") element.text = str(self._cross_sections) - def _create_multipole_library_subelement(self, root_element): - if self._multipole_library is not None: - element = ET.SubElement(root_element, "multipole_library") - element.text = str(self._multipole_library) - def export_to_xml(self, path='materials.xml'): """Export material collection to an XML file. @@ -1077,7 +1057,6 @@ class Materials(cv.CheckedList): root_element = ET.Element("materials") self._create_cross_sections_subelement(root_element) - self._create_multipole_library_subelement(root_element) self._create_material_subelements(root_element) # Clean the indentation in the file to be user-readable @@ -1114,8 +1093,5 @@ class Materials(cv.CheckedList): xs = tree.find('cross_sections') if xs is not None: materials.cross_sections = xs.text - mpl = tree.find('multipole_library') - if mpl is not None: - materials.multipole_library = mpl.text return materials diff --git a/openmc/settings.py b/openmc/settings.py index e0f3634e7a..578a8171e4 100644 --- a/openmc/settings.py +++ b/openmc/settings.py @@ -180,7 +180,6 @@ class Settings(object): self._confidence_intervals = None self._cross_sections = None self._electron_treatment = None - self._multipole_library = None self._photon_transport = None self._ptables = None self._run_cmfd = None diff --git a/scripts/openmc-make-test-data b/scripts/openmc-make-test-data index f2ae118c1b..a37a78fa9e 100755 --- a/scripts/openmc-make-test-data +++ b/scripts/openmc-make-test-data @@ -1,9 +1,10 @@ #!/usr/bin/env python3 """ -Download ENDF/B-VII.1 ENDF and ACE files from NNDC and generate a full HDF5 -library with incident neutron, incident photon, and thermal scattering data. -This data is used for OpenMC's regression test suite. +Download ENDF/B-VII.1 ENDF and ACE files from NNDC and WMP files from GitHub and +generate a full HDF5 library with incident neutron, incident photon, thermal +scattering data, and windowed multipole data. This data is used for OpenMC's +regression test suite. """ import glob @@ -19,12 +20,14 @@ from openmc._utils import download base_ace = 'http://www.nndc.bnl.gov/endf/b7.1/aceFiles/' base_endf = 'http://www.nndc.bnl.gov/endf/b7.1/zips/' +base_wmp = 'https://github.com/mit-crpg/WMP_Library/releases/download/v1.1/' files = [ (base_ace, 'ENDF-B-VII.1-neutron-293.6K.tar.gz', '9729a17eb62b75f285d8a7628ace1449'), (base_ace, 'ENDF-B-VII.1-tsl.tar.gz', 'e17d827c92940a30f22f096d910ea186'), (base_endf, 'ENDF-B-VII.1-neutrons.zip', 'e5d7f441fc4c92893322c24d1725e29c'), (base_endf, 'ENDF-B-VII.1-photoat.zip', '5192f94e61f0b385cf536f448ffab4a4'), - (base_endf, 'ENDF-B-VII.1-atomic_relax.zip', 'fddb6035e7f2b6931e51a58fc754bd10') + (base_endf, 'ENDF-B-VII.1-atomic_relax.zip', 'fddb6035e7f2b6931e51a58fc754bd10'), + (base_wmp, 'WMP_Library_v1.1.tar.gz', '8523895928dd6ba63fba803e3a45d4f3') ] @@ -36,12 +39,12 @@ def fix_zaid(table, old, new): with open(filename, 'w') as fh: fh.write(text) - +pwd = Path.cwd() +output_dir = pwd / 'nndc_hdf5' os.makedirs('nndc_hdf5/photon', exist_ok=True) with tempfile.TemporaryDirectory() as tmpdir: - # Save current working directory and temporarily change dir - pwd = os.getcwd() + # Temporarily change dir os.chdir(tmpdir) # ========================================================================= @@ -98,7 +101,7 @@ with tempfile.TemporaryDirectory() as tmpdir: data.add_elastic_0K_from_endf(endf_filename) # Determine filename - outfile = os.path.join('nndc_hdf5', data.name + '.h5') + outfile = output_dir / (data.name + '.h5') data.export_to_hdf5(outfile, 'w', 'earliest') # Register with library @@ -113,7 +116,7 @@ with tempfile.TemporaryDirectory() as tmpdir: data = openmc.data.ThermalScattering.from_ace(f) # Determine filename - outfile = os.path.join('nndc_hdf5', data.name + '.h5') + outfile = output_dir / (data.name + '.h5') data.export_to_hdf5(outfile, 'w', 'earliest') # Register with library @@ -127,23 +130,35 @@ with tempfile.TemporaryDirectory() as tmpdir: print('Generating HDF5 file for Z={} ({})...'.format(z, element)) # Generate instance of IncidentPhoton - photo_file = os.path.join('photoat', 'photoat-{:03}_{}_000.endf'.format(z, element)) - atom_file = os.path.join('atomic_relax', 'atom-{:03}_{}_000.endf'.format(z, element)) + photo_file = Path('photoat') / 'photoat-{:03}_{}_000.endf'.format(z, element) + atom_file = Path('atomic_relax') / 'atom-{:03}_{}_000.endf'.format(z, element) data = openmc.data.IncidentPhoton.from_endf(photo_file, atom_file) # Write HDF5 file and register it - outfile = os.path.join('nndc_hdf5', 'photon', element + '.h5') + outfile = output_dir / 'photon' / (element + '.h5') data.export_to_hdf5(outfile, 'w', 'earliest') library.register_file(outfile) - library.export_to_xml(os.path.join('nndc_hdf5', 'cross_sections.xml')) + # ========================================================================= + # WINDOWED MULTIPOLE DATA + + # Move data into output directory + os.rename('WMP_Library', str(output_dir / 'wmp')) + + # Add multipole data to library + for f in sorted(glob.glob('{}/wmp/*.h5'.format(output_dir))): + print('Registering WMP file {}...'.format(f)) + library.register_file(f) + + library.export_to_xml(output_dir / 'cross_sections.xml') # ========================================================================= # CREATE TARBALL AND MOVE BACK - test_tar = os.path.join(pwd, 'nndc_hdf5_test.tar.xz') - with tarfile.open(test_tar, 'w:xz') as txz: + print('Creating compressed archive...') + test_tar = pwd / 'nndc_hdf5_test.tar.xz' + with tarfile.open(str(test_tar), 'w:xz') as txz: txz.add('nndc_hdf5') # Change back to original directory - os.chdir(pwd) + os.chdir(str(pwd)) diff --git a/src/cross_sections.cpp b/src/cross_sections.cpp index dbfe416794..ed963b23f1 100644 --- a/src/cross_sections.cpp +++ b/src/cross_sections.cpp @@ -125,21 +125,6 @@ void read_cross_sections_xml() settings::path_cross_sections = get_node_value(root, "cross_sections"); } - // Find the windowed multipole library - if (settings::run_mode != RUN_MODE_PLOTTING) { - if (!check_for_node(root, "multipole_library")) { - // No library location specified in materials.xml, check - // environment variable - char* envvar = std::getenv("OPENMC_MULTIPOLE_LIBRARY"); - if (envvar) settings::path_multipole = envvar; - } else { - settings::path_multipole = get_node_value(root, "multipole_library"); - } - if (!ends_with(settings::path_multipole, "/")) { - settings::path_multipole += "/"; - } - } - // Now that the cross_sections.xml or mgxs.h5 has been located, read it in if (settings::run_CE) { read_ce_cross_sections_xml(); diff --git a/src/input_xml.F90 b/src/input_xml.F90 index d9f451e4f9..e2bf633b07 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2276,9 +2276,8 @@ contains end if end do if (.not. mp_found) call warning("Windowed multipole functionality is & - &turned on, but no multipole libraries were found. Set the & - & element in settings.xml or the & - &OPENMC_MULTIPOLE_LIBRARY environment variable.") + &turned on, but no multipole libraries were found. Make sure that & + &windowed multipole data is present in your cross_sections.xml file.") end if call already_read % clear() @@ -2302,34 +2301,14 @@ contains integer(HID_T) :: file_id integer(HID_T) :: group_id - interface - function path_multipole_c() result(ptr) bind(C) - import C_PTR - type(C_PTR) :: ptr - end function - end interface - associate (nuc => nuclides(i_table)) + ! Look for WMP data in cross_sections.xml if (library_present(LIBRARY_WMP, to_lower(nuc % name))) then - ! If WMP data is listed in cross_sections.xml, prefer that filename = library_path(LIBRARY_WMP, to_lower(nuc % name)) else - ! Otherwise, we rely on the OPENMC_MULTIPOLE_LIBRARY environment - ! variable. This is a bit hacky, but we just assume that the file will be - ! ZZZAAAmM.h5. - - call c_f_pointer(path_multipole_c(), string, [255]) - path_multipole = to_f_string(string) - - if (nuc % metastable > 0) then - filename = trim(path_multipole) // trim(zero_padded(nuc % Z, 3)) // & - trim(zero_padded(nuc % A, 3)) // 'm' // & - trim(to_str(nuc % metastable)) // ".h5" - else - filename = trim(path_multipole) // trim(zero_padded(nuc % Z, 3)) // & - trim(zero_padded(nuc % A, 3)) // ".h5" - end if + nuc % mp_present = .false. + return end if ! Check if Multipole library exists and is readable diff --git a/src/relaxng/materials.rnc b/src/relaxng/materials.rnc index d2a84418ea..c82ecfeaac 100644 --- a/src/relaxng/materials.rnc +++ b/src/relaxng/materials.rnc @@ -37,7 +37,5 @@ element materials { }* }+ & - element cross_sections { xsd:string { maxLength = "255" } }? & - - element multipole_library { xsd:string { maxLength = "255" } }? + element cross_sections { xsd:string { maxLength = "255" } }? } diff --git a/src/relaxng/materials.rng b/src/relaxng/materials.rng index 90d6ec5c6e..e99fb7adfe 100644 --- a/src/relaxng/materials.rng +++ b/src/relaxng/materials.rng @@ -161,12 +161,5 @@ - - - - 255 - - - diff --git a/src/settings.F90 b/src/settings.F90 index 665c0e481f..6c8a610361 100644 --- a/src/settings.F90 +++ b/src/settings.F90 @@ -101,7 +101,6 @@ module settings character(MAX_FILE_LEN) :: path_input ! Path to input file character(MAX_FILE_LEN) :: path_cross_sections = '' ! Path to cross_sections.xml - character(MAX_FILE_LEN) :: path_multipole ! Path to wmp library character(MAX_FILE_LEN) :: path_state_point ! Path to binary state point character(MAX_FILE_LEN) :: path_source_point ! Path to binary source point character(MAX_FILE_LEN) :: path_particle_restart ! Path to particle restart diff --git a/src/settings.cpp b/src/settings.cpp index 0d67137bcd..459d7115db 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -63,7 +63,6 @@ bool dagmc {false}; std::string path_cross_sections; std::string path_input; -std::string path_multipole; std::string path_output; std::string path_particle_restart; std::string path_source; @@ -73,7 +72,7 @@ std::string path_statepoint; int32_t index_entropy_mesh {-1}; int32_t index_ufs_mesh {-1}; int32_t index_cmfd_mesh {-1}; - + int32_t n_batches; int32_t n_inactive {0}; int32_t gen_per_batch {1}; @@ -257,21 +256,6 @@ void read_settings_xml() path_cross_sections = get_node_value(root, "cross_sections"); } - // Look for deprecated windowed_multipole file in settings.xml - if (run_mode != RUN_MODE_PLOTTING) { - if (check_for_node(root, "multipole_library")) { - warning("Setting multipole_library in settings.xml has been " - "deprecated. The multipole_library is now set in materials.xml and" - " the multipole_library input to materials.xml and the " - "OPENMC_MULTIPOLE_LIBRARY environment variable will take " - "precendent over setting multipole_library in settings.xml."); - path_multipole = get_node_value(root, "multipole_library"); - } - if (!ends_with(path_multipole, "/")) { - path_multipole += "/"; - } - } - if (!run_CE) { // Scattering Treatments if (check_for_node(root, "max_order")) { @@ -839,9 +823,6 @@ extern "C" { const char* path_input_c() { return settings::path_input.c_str(); } - const char* path_multipole_c() { - return settings::path_multipole.c_str(); - } const char* path_statepoint_c() { return settings::path_statepoint.c_str(); } diff --git a/tests/regression_tests/diff_tally/test.py b/tests/regression_tests/diff_tally/test.py index de5423fd9f..b688e6d233 100644 --- a/tests/regression_tests/diff_tally/test.py +++ b/tests/regression_tests/diff_tally/test.py @@ -113,9 +113,6 @@ class DiffTallyTestHarness(PyAPITestHarness): return df.to_csv(None, columns=cols, index=False, float_format='%.7e') -@pytest.mark.skipif('OPENMC_MULTIPOLE_LIBRARY' not in os.environ, - reason='OPENMC_MULTIPOLE_LIBRARY environment variable ' - 'must be set') def test_diff_tally(): harness = DiffTallyTestHarness('statepoint.3.h5') harness.main() diff --git a/tests/regression_tests/multipole/test.py b/tests/regression_tests/multipole/test.py index ef797a1bc5..c826ff0d79 100644 --- a/tests/regression_tests/multipole/test.py +++ b/tests/regression_tests/multipole/test.py @@ -74,9 +74,6 @@ class MultipoleTestHarness(PyAPITestHarness): return outstr -@pytest.mark.skipif('OPENMC_MULTIPOLE_LIBRARY' not in os.environ, - reason='OPENMC_MULTIPOLE_LIBRARY environment variable ' - 'must be set') def test_multipole(): model = make_model() harness = MultipoleTestHarness('statepoint.5.h5', model) diff --git a/tests/unit_tests/test_data_multipole.py b/tests/unit_tests/test_data_multipole.py index 4683dcd3af..02147bf0e3 100644 --- a/tests/unit_tests/test_data_multipole.py +++ b/tests/unit_tests/test_data_multipole.py @@ -1,25 +1,23 @@ import os +import pathlib import numpy as np import pytest import openmc.data -pytestmark = pytest.mark.skipif( - 'OPENMC_MULTIPOLE_LIBRARY' not in os.environ, - reason='OPENMC_MULTIPOLE_LIBRARY environment variable must be set') @pytest.fixture(scope='module') def u235(): - directory = os.environ['OPENMC_MULTIPOLE_LIBRARY'] - filename = os.path.join(directory, '092235.h5') - return openmc.data.WindowedMultipole.from_hdf5(filename) + directory = pathlib.Path(os.environ['OPENMC_CROSS_SECTIONS']).parent + u235 = directory / 'wmp' / '092235.h5' + return openmc.data.WindowedMultipole.from_hdf5(u235) @pytest.fixture(scope='module') def b10(): - directory = os.environ['OPENMC_MULTIPOLE_LIBRARY'] - filename = os.path.join(directory, '005010.h5') - return openmc.data.WindowedMultipole.from_hdf5(filename) + directory = pathlib.Path(os.environ['OPENMC_CROSS_SECTIONS']).parent + b10 = directory / 'wmp' / '005010.h5' + return openmc.data.WindowedMultipole.from_hdf5(b10) def test_evaluate(u235): diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py index 7cedd8deef..30a3e24983 100644 --- a/tests/unit_tests/test_material.py +++ b/tests/unit_tests/test_material.py @@ -154,7 +154,6 @@ def test_materials(run_in_tmpdir): mats = openmc.Materials([m1, m2]) mats.cross_sections = '/some/fake/cross_sections.xml' - mats.multipole_library = '/some/awesome/mp_lib/' mats.export_to_xml() @@ -200,7 +199,6 @@ def test_from_xml(run_in_tmpdir): mats = openmc.Materials([m1, m2, m3]) mats.cross_sections = 'fake_path.xml' - mats.multipole_library = 'fake_multipole/' mats.export_to_xml() # Regenerate materials from XML diff --git a/tests/unit_tests/test_settings.py b/tests/unit_tests/test_settings.py index e3bfc697eb..30ec0e683c 100644 --- a/tests/unit_tests/test_settings.py +++ b/tests/unit_tests/test_settings.py @@ -20,7 +20,6 @@ def test_export_to_xml(run_in_tmpdir): s.statepoint = {'batches': [50, 150, 500, 1000]} s.confidence_intervals = True s.cross_sections = '/path/to/cross_sections.xml' - s.multipole_library = '/path/to/wmp/' s.ptables = True s.run_cmfd = False s.seed = 17