From c2e612a5031b35d47b5e46d8536c77b35d5d3b51 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 23 May 2019 09:22:44 -0500 Subject: [PATCH] Update HDF5 data version to 3.0 --- docs/source/usersguide/cross_sections.rst | 8 ++++---- include/openmc/constants.h | 3 +-- openmc/data/__init__.py | 2 +- tools/ci/download-xs.sh | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/source/usersguide/cross_sections.rst b/docs/source/usersguide/cross_sections.rst index e6a79815f9..636b44db46 100644 --- a/docs/source/usersguide/cross_sections.rst +++ b/docs/source/usersguide/cross_sections.rst @@ -11,7 +11,7 @@ or multi-group mode. In continuous-energy mode, OpenMC uses a native `HDF5 `_ format (see :ref:`io_nuclear_data`) to store all nuclear data. Pregenerated HDF5 libraries can be found at -https://openmc.mcs.anl.gov; unless you have specific data needs, it is highly +https://openmc.org; unless you have specific data needs, it is highly recommended to use one of the pregenerated libraries. Alternatively, if you have ACE format data that was produced with NJOY_, such as that distributed with MCNP_ or Serpent_, it can be converted to the HDF5 format using the :ref:`using @@ -61,7 +61,7 @@ Using Pregenerated Libraries ---------------------------- Various evaluated nuclear data libraries have been processed into the HDF5 -format required by OpenMC and can be found at https://openmc.mcs.anl.gov. You +format required by OpenMC and can be found at https://openmc.org. You can find both libraries generated by the OpenMC development team as well as libraries based on ACE files distributed elsewhere. To use these libraries, download the archive file, unpack it, and then set your @@ -198,7 +198,7 @@ file, is distributed with OpenMC. The rest is available from the NNDC_, which provides ENDF data from the photo-atomic and atomic relaxation sublibraries of the ENDF/B-VII.1 library. -Most of the pregenerated HDF5 libraries available at https://openmc.mcs.anl.gov +Most of the pregenerated HDF5 libraries available at https://openmc.org already have photon interaction data included. If you are building a data library yourself, it is possible to use the Python API directly to convert photon interaction data from an ENDF or ACE file to an HDF5 file. The @@ -237,7 +237,7 @@ the :class:`openmc.data.DataLibrary` class to register the .h5 files as described in :ref:`create_xs_library`. The `official ENDF/B-VII.1 HDF5 library -`_ includes the windowed +`_ includes the windowed multipole library, so if you are using this library, the windowed multipole data will already be available to you. diff --git a/include/openmc/constants.h b/include/openmc/constants.h index 6b2e6f63b7..394f90740f 100644 --- a/include/openmc/constants.h +++ b/include/openmc/constants.h @@ -26,7 +26,7 @@ constexpr bool VERSION_DEV {true}; constexpr std::array VERSION {VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE}; // HDF5 data format -constexpr int HDF5_VERSION[] {2, 0}; +constexpr int HDF5_VERSION[] {3, 0}; // Version numbers for binary files constexpr std::array VERSION_STATEPOINT {17, 0}; @@ -36,7 +36,6 @@ constexpr std::array VERSION_SUMMARY {6, 0}; constexpr std::array VERSION_VOLUME {1, 0}; constexpr std::array VERSION_VOXEL {2, 0}; constexpr std::array VERSION_MGXS_LIBRARY {1, 0}; -constexpr char VERSION_MULTIPOLE[] {"v0.2"}; // ============================================================================ // ADJUSTABLE PARAMETERS diff --git a/openmc/data/__init__.py b/openmc/data/__init__.py index 92acc96354..277c14ca8d 100644 --- a/openmc/data/__init__.py +++ b/openmc/data/__init__.py @@ -1,5 +1,5 @@ # Version of HDF5 nuclear data format -HDF5_VERSION_MAJOR = 2 +HDF5_VERSION_MAJOR = 3 HDF5_VERSION_MINOR = 0 HDF5_VERSION = (HDF5_VERSION_MAJOR, HDF5_VERSION_MINOR) diff --git a/tools/ci/download-xs.sh b/tools/ci/download-xs.sh index 38a5bc4692..07ade9c70f 100755 --- a/tools/ci/download-xs.sh +++ b/tools/ci/download-xs.sh @@ -3,7 +3,7 @@ set -ex # Download HDF5 data if [[ ! -e $HOME/nndc_hdf5/cross_sections.xml ]]; then - wget -q -O - https://anl.box.com/shared/static/u1g3n8iai0u1n5f6ev3pg2j3ff941bqa.xz | tar -C $HOME -xJ + wget -q -O - https://anl.box.com/shared/static/teaup95cqv8s9nn56hfn7ku8mmelr95p.xz | tar -C $HOME -xJ fi # Download ENDF/B-VII.1 distribution