From e2dc2cee43224c3a5a9fc19641c3b724509e72be Mon Sep 17 00:00:00 2001
From: liangjg <liangjg2008@gmail.com>
Date: Fri, 19 Oct 2018 16:48:12 -0400
Subject: [PATCH] update python api for wmp v1.1

---
 examples/jupyter/nuclear-data.ipynb |  2 +-
 openmc/data/__init__.py             |  4 +-
 openmc/data/multipole.py            | 58 ++++++++++++++++++++---------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/examples/jupyter/nuclear-data.ipynb b/examples/jupyter/nuclear-data.ipynb
index 91923faa1d..f1c4c2b2af 100644
--- a/examples/jupyter/nuclear-data.ipynb
+++ b/examples/jupyter/nuclear-data.ipynb
@@ -1466,7 +1466,7 @@
    },
    "outputs": [],
    "source": [
-    "url = 'https://github.com/mit-crpg/WMP_Library/releases/download/v1.0/092238.h5'\n",
+    "url = 'https://github.com/mit-crpg/WMP_Library/releases/download/v1.1/092238.h5'\n",
     "filename, headers = urllib.request.urlretrieve(url, '092238.h5')"
    ]
   },
diff --git a/openmc/data/__init__.py b/openmc/data/__init__.py
index dec11cd3a9..9aff59444d 100644
--- a/openmc/data/__init__.py
+++ b/openmc/data/__init__.py
@@ -4,7 +4,9 @@ HDF5_VERSION_MINOR = 0
 HDF5_VERSION = (HDF5_VERSION_MAJOR, HDF5_VERSION_MINOR)
 
 # Version of WMP nuclear data format
-WMP_VERSION = 'v1.0'
+WMP_VERSION_MAJOR = 1
+WMP_VERSION_MINOR = 1
+WMP_VERSION = (WMP_VERSION_MAJOR, WMP_VERSION_MINOR)
 
 
 from .data import *
diff --git a/openmc/data/multipole.py b/openmc/data/multipole.py
index a0d90ac019..5d34c9ff6e 100644
--- a/openmc/data/multipole.py
+++ b/openmc/data/multipole.py
@@ -4,7 +4,7 @@ from math import exp, erf, pi, sqrt
 import h5py
 import numpy as np
 
-from . import WMP_VERSION
+from . import WMP_VERSION, WMP_VERSION_MAJOR
 from .data import K_BOLTZMANN
 import openmc.checkvalue as cv
 from openmc.mixin import EqualityMixin
@@ -133,6 +133,8 @@ class WindowedMultipole(EqualityMixin):
 
     Parameters
     ----------
+    name : str
+        Name of the nuclide using the GND naming convention
 
     Attributes
     ----------
@@ -171,7 +173,8 @@ class WindowedMultipole(EqualityMixin):
         a/E + b/sqrt(E) + c + d sqrt(E) + ...
 
     """
-    def __init__(self):
+    def __init__(self, name):
+        self.name = name
         self.spacing = None
         self.sqrtAWR = None
         self.E_min = None
@@ -181,6 +184,10 @@ class WindowedMultipole(EqualityMixin):
         self.broaden_poly = None
         self.curvefit = None
 
+    @property
+    def name(self):
+        return self._name
+
     @property
     def fit_order(self):
         return self.curvefit.shape[1] - 1
@@ -221,6 +228,11 @@ class WindowedMultipole(EqualityMixin):
     def curvefit(self):
         return self._curvefit
 
+    @name.setter
+    def name(self, name):
+        cv.check_type('name', name, str)
+        self._name = name
+
     @spacing.setter
     def spacing(self, spacing):
         if spacing is not None:
@@ -322,17 +334,25 @@ class WindowedMultipole(EqualityMixin):
             group = group_or_filename
         else:
             h5file = h5py.File(group_or_filename, 'r')
-            try:
-                version = h5file['version'].value.decode()
-            except AttributeError:
-                version = h5file['version'].value[0].decode()
-            if version != WMP_VERSION:
-                raise ValueError('The given WMP data uses version '
-                    + version + ' whereas your installation of the OpenMC '
-                    'Python API expects version ' + WMP_VERSION)
-            group = h5file['nuclide']
 
-        out = cls()
+            # Make sure version matches
+            if 'version' in h5file.attrs:
+                major, minor = h5file.attrs['version']
+                if major != WMP_VERSION_MAJOR:
+                    raise IOError(
+                        'WMP data format uses version {}. {} whereas your '
+                        'installation of the OpenMC Python API expects version '
+                        '{}.x.'.format(major, minor, WMP_VERSION_MAJOR))
+            else:
+                raise IOError(
+                    'WMP data does not indicate a version. Your installation of '
+                    'the OpenMC Python API expects version {}.x data.'
+                    .format(WMP_VERSION_MAJOR))
+
+            group = list(h5file.values())[0]
+
+        name = group.name[1:]
+        out = cls(name)
 
         # Read scalars.
 
@@ -478,13 +498,16 @@ class WindowedMultipole(EqualityMixin):
         fun = np.vectorize(lambda x: self._evaluate(x, T))
         return fun(E)
 
-    def export_to_hdf5(self, path, libver='earliest'):
+    def export_to_hdf5(self, path, mode='a', libver='earliest'):
         """Export windowed multipole data to an HDF5 file.
 
         Parameters
         ----------
         path : str
             Path to write HDF5 file to
+        mode : {'r', r+', 'w', 'x', 'a'}
+            Mode that is used to open the HDF5 file. This is the second argument
+            to the :class:`h5py.File` constructor.
         libver : {'earliest', 'latest'}
             Compatibility mode for the HDF5 file. 'latest' will produce files
             that are less backwards compatible but have performance benefits.
@@ -492,12 +515,11 @@ class WindowedMultipole(EqualityMixin):
         """
 
         # Open file and write version.
-        with h5py.File(path, 'w', libver=libver) as f:
-            f.create_dataset('version', (1, ), dtype='S10')
-            f['version'][:] = WMP_VERSION.encode('ASCII')
+        with h5py.File(path, mode, libver=libver) as f:
+            f.attrs['filetype'] = np.string_('data_wmp')
+            f.attrs['version'] = np.array(WMP_VERSION)
 
-            # Make a nuclide group.
-            g = f.create_group('nuclide')
+            g = f.create_group(self.name)
 
             # Write scalars.
             g.create_dataset('spacing', data=np.array(self.spacing))