Merge remote-tracking branch 'upstream/develop' into pyapi_multipole

docs/source/conf.py

@@ -25,7 +25,7 @@ except ImportError:
 
 
 MOCK_MODULES = ['numpy', 'numpy.polynomial', 'numpy.polynomial.polynomial',
-                'h5py', 'pandas', 'opencg']
+                'h5py', 'pandas', 'uncertainties', 'opencg']
 sys.modules.update((mod_name, MagicMock()) for mod_name in MOCK_MODULES)
 
 import numpy as np

docs/source/developers.rst

@@ -13,6 +13,7 @@ Active development of the OpenMC Monte Carlo code is currently led by:
 * `Jon Walsh <https://github.com/walshjon>`_
 * `Sterling Harper <https://github.com/smharper>`_
 * `Will Boyd <https://github.com/wbinventor>`_
+* `Samuel Shaner <https://github.com/samuelshaner>`_
 * `Benoit Forget <http://web.mit.edu/nse/people/faculty/forget.html>`_
 * `Kord Smith <http://web.mit.edu/nse/people/faculty/smith.html>`_
-* `Andrew Siegel <http://www.mcs.anl.gov/about/people_detail.php?id=404>`_
+* `Andrew Siegel <http://www.mcs.anl.gov/person/andrew-siegel>`_

docs/source/devguide/workflow.rst

@@ -238,4 +238,4 @@ from your private repository into a public fork.
 .. _paid plan: https://github.com/plans
 .. _Bitbucket: https://bitbucket.org
 .. _ctest: http://www.cmake.org/cmake/help/v2.8.12/ctest.html
-.. _NNDC:  http://http://www.nndc.bnl.gov/endf/b7.1/acefiles.html
+.. _NNDC:  http://www.nndc.bnl.gov/endf/b7.1/acefiles.html

docs/source/methods/geometry.rst

@@ -384,7 +384,7 @@ x - x_0`, :math:`\bar{y} = y - y_0`, and :math:`\bar{z} = z - z_0`. We then have
 Expanding equation :eq:`dist-xcone-1` and rearranging terms, we obtain
 
 .. math::
-    :label: dist-xcylinder-2
+    :label: dist-xcone-2
 
     (v^2 + w^2 - R^2u^2) d^2 + 2 (\bar{y}v + \bar{z}w - R^2\bar{x}u) d +
     (\bar{y}^2 + \bar{z}^2 - R^2\bar{x}^2) = 0
@@ -392,7 +392,7 @@ Expanding equation :eq:`dist-xcone-1` and rearranging terms, we obtain
 Defining the terms
 
 .. math::
-    :label: dist-quadric-terms
+    :label: dist-xcone-terms
 
     a = v^2 + w^2 - R^2u^2
 
@@ -896,4 +896,4 @@ Dxy + Eyz + Fxz + Gx + Hy + Jz + K = 0`. Thus, the gradient to the surface is
 .. _surfaces: http://en.wikipedia.org/wiki/Surface
 .. _MCNP: http://mcnp.lanl.gov
 .. _Serpent: http://montecarlo.vtt.fi
-.. _Monte Carlo Performance benchmark: https://github.com/paulromano/benchmarks/tree/master/mc-performance/openmc
+.. _Monte Carlo Performance benchmark: https://github.com/mit-crpg/benchmarks/tree/master/mc-performance/openmc

docs/source/publications.rst

@@ -82,6 +82,10 @@ Coupling and Multi-physics
 Geometry
 --------
 
+- Derek M. Lax, "Memory efficient indexing algorithm for physical properties in
+  OpenMC," S. M. Thesis, Massachusetts Institute of Technology
+  (2015). `<http://hdl.handle.net/1721.1/97862>`_
+
 - Derek Lax, William Boyd, Nicholas Horelik, Benoit Forget, and Kord Smith, "A
   memory efficient algorithm for classifying unique regions in constructive
   solid geometries," *Proc. PHYSOR*, Kyoto, Japan, Sep. 28--Oct. 3 (2014).
@@ -106,6 +110,10 @@ Miscellaneous
   triggers for the OpenMC Monte Carlo code," *Trans. Am. Nucl. Soc.*, **112**,
   637-640 (2015).
 
+- Kyungkwan Noh and Deokjung Lee, "Whole Core Analysis using OpenMC Monte Carlo
+  Code," *Trans. Kor. Nucl. Soc. Autumn Meeting*, Gyeongju, Korea,
+  Oct. 24-25, 2013.
+
 - Timothy P. Burke, Brian C. Kiedrowski, and William R. Martin, "Flux and
   Reaction Rate Kernel Density Estimators in OpenMC," *Trans. Am. Nucl. Soc.*,
   **109**, 683-686 (2013).
@@ -139,7 +147,7 @@ Doppler Broadening
 
 - Colin Josey, Pablo Ducru, Benoit Forget, and Kord Smith, "Windowed multipole
   for cross section Doppler broadening," *J. Comput. Phys.*, **307**, 715-727
-  (2016). `<http://dx.doi.org/10.1016/jcp.2015.08.013>`_
+  (2016). `<http://dx.doi.org/10.1016/j.jcp.2015.08.013>`_
 
 - Jonathan A. Walsh, Benoit Forget, Kord S. Smith, and Forrest B. Brown,
   "On-the-fly Doppler Broadening of Unresolved Resonance Region Cross Sections
@@ -169,6 +177,11 @@ Nuclear Data
 - Paul K. Romano and Sterling M. Harper, "Nuclear data processing capabilities
   in OpenMC", *Proc. Nuclear Data*, Sep. 11-16, 2016.
 
+- Jonathan A. Walsh, Benoit Froget, Kord S. Smith, and Forrest B. Brown,
+  "Neutron Cross Section Processing Methods for Improved Integral Benchmarking
+  of Unresolved Resonance Region Evaluations," *Eur. Phys. J. Web Conf.*
+  **111**, 06001 (2016). `<http://dx.doi.org/10.1051/epjconf/201611106001>`_
+
 - Jonathan A. Walsh, Paul K. Romano, Benoit Forget, and Kord S. Smith,
   "Optimizations of the energy grid search algorithm in continuous-energy Monte
   Carlo particle transport codes", *Comput. Phys. Commun.*, **196**, 134-142
@@ -213,10 +226,19 @@ Parallelism
   memory subsystem on Monte Carlo code performance," *Proc. Joint
   Int. Conf. M&C+SNA+MC*, Nashville, Tennessee, Apr. 19--23 (2015).
 
+- Hajime Fujita, Nan Dun, Aiman Fang, Zachary A. Rubinstein, Ziming Zheng, Kamil
+  Iskra, Jeff Hammonds, Anshu Dubey, Pavan Balaji, and Andrew A. Chien, "Using
+  Global View Resilience (GVR) to add Resilience to Exascale Applications,"
+  *Proc. Supercomputing*, New Orleans, Louisiana, Nov. 16--21, 2014.
+
 - Nicholas Horelik, Benoit Forget, Kord Smith, and Andrew Siegel, "Domain
   decomposition and terabyte tallies with the OpenMC Monte Carlo neutron
   transport code," *Proc. PHYSOR*, Kyoto Japan, Sep. 28--Oct. 3 (2014).
 
+- John R. Tramm, Andrew R. Siegel, Tanzima Islam, and Martin Schulz, "XSBench --
+  the development and verification of a performance abstraction for Monte Carlo
+  reactor analysis," *Proc. PHYSOR*, Kyoto, Japan, Sep 28--Oct. 3, 2014.
+
 - Nicholas Horelik, Andrew Siegel, Benoit Forget, and Kord Smith, "Monte Carlo
   domain decomposition for robust nuclear reactor analysis," *Parallel Comput.*,
   **40**, 646--660 (2014). `<http://dx.doi.org/10.1016/j.parco.2014.10.001>`_
@@ -270,6 +292,10 @@ Parallelism
 Depletion
 ---------
 
+- Anas Gul, K. S. Chaudri, R. Khan, and M. Azeen, "Development and verification
+  of LOOP: A Linkage of ORIGEN2.2 and OpenMC," *Ann. Nucl. Energy*, **99**,
+  321--327 (2017). `<http://dx.doi.org/10.1016/j.anucene.2016.09.016>`_
+
 - Kai Huang, Hongchun Wu, Yunzhao Li, and Liangzhi Cao, "Generalized depletion
   chain simplification based of significance analysis," *Proc. PHYSOR*, Sun
   Valley, Idaho, May 1-5, 2016.

docs/source/pythonapi/index.rst

@@ -373,6 +373,8 @@ Core Classes
     openmc.data.CoherentElastic
     openmc.data.FissionEnergyRelease
     openmc.data.DataLibrary
+    openmc.data.Decay
+    openmc.data.FissionProductYields
     openmc.data.WindowedMultipole
 
 Core Functions
@@ -477,6 +479,7 @@ Functions
 
     openmc.data.endf.float_endf
     openmc.data.endf.get_cont_record
+    openmc.data.endf.get_evaluations
     openmc.data.endf.get_head_record
     openmc.data.endf.get_tab1_record
     openmc.data.endf.get_tab2_record