Merge branch 'release-0.6.0' into develop

docs/source/conf.py

@@ -46,9 +46,9 @@ copyright = u'2011-2014, Massachusetts Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = "0.5"
+version = "0.6"
 # The full version, including alpha/beta/rc tags.
-release = "0.5.3"
+release = "0.6.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/publications.rst

@@ -28,23 +28,25 @@ Publications
 - Paul K. Romano, Benoit Forget, Kord Smith, and Andrew Siegel, "On the use of
   tally servers in Monte Carlo simulations of light-water reactors,"
   *Proc. Joint International Conference on Supercomputing in Nuclear
-  Applications and Monte Carlo*, Paris, France, Oct. 27--31 (2013).
+  Applications and Monte Carlo*, Paris, France, Oct. 27--31
+  (2013). `<http://dx.doi.org/10.1051/snamc/201404301>`_
 
 - Paul K. Romano, Nicholas E. Horelik, Bryan R. Herman, Adam G. Nelson, Benoit
   Forget, and Kord Smith, "OpenMC: A State-of-the-Art Monte Carlo Code for
   Research and Development," *Proc. Joint International Conference on
   Supercomputing in Nuclear Applications and Monte Carlo*, Paris, France,
-  Oct. 27--31 (2013).
+  Oct. 27--31 (2013). `<http://dx.doi.org/10.1051/snamc/201406016>`_
 
 - Kyle G. Felker, Andrew R. Siegel, Kord S. Smith, Paul K. Romano, and Benoit
   Forget, "The energy band memory server algorithm for parallel Monte Carlo
   calculations," *Proc. Joint International Conference on Supercomputing in
-  Nuclear Applications and Monte Carlo*, Paris, France, Oct. 27--31 (2013).
+  Nuclear Applications and Monte Carlo*, Paris, France, Oct. 27--31
+  (2013). `<http://dx.doi.org/10.1051/snamc/201404207>`_
 
 - John R. Tramm and Andrew R. Siegel, "Memory Bottlenecks and Memory Contention
   in Multi-Core Monte Carlo Transport Codes," *Proc. Joint International
   Conference on Supercomputing in Nuclear Applications and Monte Carlo*, Paris,
-  France, Oct. 27--31 (2013).
+  France, Oct. 27--31 (2013). `<http://dx.doi.org/10.1051/snamc/201404208>`_
 
 - Andrew R. Siegel, Kord Smith, Paul K. Romano, Benoit Forget, and Kyle Felker,
   "Multi-core performance studies of a Monte Carlo neutron transport code,"

docs/source/usersguide/install.rst

@@ -494,4 +494,3 @@ schemas.xml file in your own OpenMC source directory.
 .. _validation: http://en.wikipedia.org/wiki/XML_validation
 .. _RELAX NG: http://relaxng.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

docs/source/usersguide/processing.rst

@@ -17,7 +17,6 @@ for your Python installation to contain:
 * [3]_ `Matplotlib <http://matplotlib.org/>`_
 * [3]_ `Silomesh <https://github.com/nhorelik/silomesh>`_
 * [3]_ `VTK <http://www.vtk.org/>`_
-* [4]_ `PyQt <http://www.riverbankcomputing.com/software/pyqt>`_
 
 Most of these are easily obtainable in Ubuntu through the package manager, or
 are easily installed with distutils.
@@ -25,7 +24,6 @@ are easily installed with distutils.
 .. [1] Required for tally data extraction from statepoints with statepoint.py
 .. [2] Required only if reading HDF5 statepoint files. 
 .. [3] Optional for plotting utilities
-.. [4] Optional for interactive GUIs
 
 ----------------------
 Geometry Visualization
@@ -94,9 +92,9 @@ After running OpenMC to obtain PPM files, images should be saved to another
 format before using them elsewhere. This cuts down the size of the file by
 orders of magnitude.  Most image viewers and editors that can view PPM images
 can also save to other formats (e.g. `Gimp <http://www.gimp.org/>`_, `IrfanView
-<http://www.irfanview.com/>`_, etc.).  However, more likey the user will want to
+<http://www.irfanview.com/>`_, etc.).  However, more likely the user will want to
 convert to another format on the command line.  This is easily accomplished with
-the ``convert`` command available on most linux distributions as part of the
+the ``convert`` command available on most Linux distributions as part of the
 `ImageMagick <http://www.imagemagick.org/script/convert.php>`_ package. (On
 Ubuntu: ``sudo apt-get install imagemagick``).  Images are then converted like:
 
@@ -172,7 +170,7 @@ doing this will depend on the 3D viewer, but should be straightforward.
    :height: 200px
 
 .. note:: 3D voxel plotting can be very computer intensive for the viewing
-          program (Visit, Paraview, etc.) if the number of voxels is large (>10
+          program (Visit, ParaView, etc.) if the number of voxels is large (>10
           million or so).  Thus if you want an accurate picture that renders
           smoothly, consider using only one voxel in a certain direction. For
           instance, the 3D pin lattice figure at the beginning of this section
@@ -235,13 +233,13 @@ combination:
     filters = [('mesh', (1, 1, 5)), ('energyin', 0)]
     value, error = sp.get_value(tallyid, filters, score)
 
-In the future more documentaion may become available here for statepoint.py and
+In the future more documentation may become available here for statepoint.py and
 the data extraction functions of StatePoint objects. However, for now it is up
 to the user to explore the classes in statepoint.py to discover what data is
 available in StatePoint objects (we highly recommend interactively exploring
-with `IPython <http://ipython.org/>`_). Many exmaples can be found by looking
-through the other utilies that use statepoint.py, and a few common visualization
-tasks will be described here in the following sections.
+with `IPython <http://ipython.org/>`_). Many examples can be found by looking
+through the other utilities that use statepoint.py, and a few common
+visualization tasks will be described here in the following sections.
 
 Plotting in 2D
 --------------
@@ -251,8 +249,7 @@ Plotting in 2D
 
 For simple viewing of 2D slices of a mesh plot, the utility plot_mesh_tally.py
 is provided.  This utility provides an interactive GUI to explore and plot
-mesh tallies for any scores and filter bins.  It requires statepoint.py, as well
-as `PyQt <http://www.riverbankcomputing.com/software/pyqt>`_.
+mesh tallies for any scores and filter bins.  It requires statepoint.py.
 
 .. image:: ../_images/fluxplot.png
    :height: 200px
@@ -446,14 +443,14 @@ Particle Track Visualization
 
 OpenMC can dump particle tracks—the position of particles as they are
 transported through the geometry.  There are two ways to make OpenMC output
-tracks: all particle tracks through a commandline argument or specific particle
+tracks: all particle tracks through a command line argument or specific particle
 tracks through settings.xml.
 
 Running OpenMC with the argument "-t", "-track", or "--track" will cause a track
 file to be created for every particle transported in the code.
 
 The settings.xml file can dictate that specific particle tracks are output.
-These particles are specified withen a ''track'' element.  The ''track'' element
+These particles are specified within a ''track'' element.  The ''track'' element
 should contain triplets of integers specifying the batch, generation, and
 particle numbers, respectively.  For example, to output the tracks for particles
 3 and 4 of batch 1 and generation 2 the settings.xml file should contain:
@@ -474,7 +471,7 @@ describing track files.  The default output name is "track.pvtp".  A common
 usage of track.py is "track.py track*.binary" which will use the data from all
 binary track files in the directory to write a "track.pvtp" VTK output file.
 The .pvtp file can then be read and plotted by 3d visualization programs such as
-Paraview.
+ParaView.
 
 ----------------------
 Source Site Processing

src/constants.F90

@@ -7,8 +7,8 @@ module constants
 
   ! OpenMC major, minor, and release numbers
   integer, parameter :: VERSION_MAJOR   = 0
-  integer, parameter :: VERSION_MINOR   = 5
-  integer, parameter :: VERSION_RELEASE = 4
+  integer, parameter :: VERSION_MINOR   = 6
+  integer, parameter :: VERSION_RELEASE = 0
 
   ! Revision numbers for binary files
   integer, parameter :: REVISION_STATEPOINT       = 12

src/utils/setup.py

@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name='statepoint',
-      version='0.5.4',
+      version='0.6.0',
       description='OpenMC StatePoint',
       author='Paul Romano',
       author_email='paul.k.romano@gmail.com',