Merge branch 'develop' into log-energy-grid

docs/source/methods/physics.rst

@@ -682,17 +682,20 @@ nuclear temperature, which is a function of the incoming energy of the
 neutron. The ACE format contains a list of nuclear temperatures versus incoming
 energies. The nuclear temperature is interpolated between neighboring incoming
 energies using a specified interpolation law. Once the temperature :math:`T` is
-determined, we then calculate a candidate outgoing energy based on rule C45 in
-the `Monte Carlo Sampler`_:
+determined, we then calculate a candidate outgoing energy based on the algorithm
+given in LA-UR-14-27694_:
 
 .. math::
     :label: evaporation-E
 
-    E' = -T \log (\xi_1 \xi_2)
+    E' = -T \log ((1 - g\xi_1)(1 - g\xi_2))
 
-where :math:`\xi_1, \xi_2` are random numbers sampled on the unit
-interval. The outgoing energy is only accepted according to a specified
-restriction energy as in equation :eq:`maxwell-restriction`.
+where :math:`g = 1 - e^{-w}`, :math:`w = (E - U)/T`, :math:`U` is the
+restriction energy, and :math:`\xi_1, \xi_2` are random numbers sampled on the
+unit interval. The outgoing energy is only accepted according to the restriction
+energy as in equation :eq:`maxwell-restriction`. This algorithm has a much
+higher rejection efficiency than the standard technique, i.e. rule C45 in the
+`Monte Carlo Sampler`_.
 
 ACE Law 11 - Energy-Dependent Watt Spectrum
 +++++++++++++++++++++++++++++++++++++++++++
@@ -1591,6 +1594,8 @@ References
 
 .. _Monte Carlo Sampler: https://laws.lanl.gov/vhosts/mcnp.lanl.gov/pdf_files/la-9721_3rdmcsampler.pdf
 
+.. _LA-UR-14-27694: http://permalink.lanl.gov/object/tr?what=info:lanl-repo/lareport/LA-UR-14-27694
+
 .. _MC21: http://www.osti.gov/bridge/servlets/purl/903083-HT5p1o/903083.pdf
 
 .. _Sutton and Brown: http://www.osti.gov/bridge/product.biblio.jsp?osti_id=307911

docs/source/quickinstall.rst

@@ -35,9 +35,9 @@ OpenMC from source as is described in :ref:`usersguide_install`.
 Installing from Source on Linux or Mac OS X
 -------------------------------------------
 
-All OpenMC source code is hosted on GitHub_. If you have git_ and the gfortran_
-compiler installed, you can download and install OpenMC be entering the
-following commands in a terminal:
+All OpenMC source code is hosted on GitHub_. If you have git_, the gfortran_
+compiler, and CMake_ installed, you can download and install OpenMC be entering
+the following commands in a terminal:
 
 .. code-block:: sh
 
@@ -58,3 +58,4 @@ can be replaced with a local install, e.g.
 .. _GitHub: https://github.com/mit-crpg/openmc
 .. _git: http://git-scm.com
 .. _gfortran: http://gcc.gnu.org/wiki/GFortran
+.. _CMake: http://www.cmake.org

docs/source/usersguide/input.rst

@@ -759,7 +759,10 @@ Each ``<cell>`` element can have the following attributes or sub-elements:
     is on the negative side of surface 3 and the positive side of surface 5, the
     bounding surfaces would be given as "-3 5".
 
-    *Default*: None
+    .. note:: The surface attribute/element can be omitted to make a cell fill
+              its entire universe.
+
+    *Default*: No surfaces
 
   :rotation:
     If the cell is filled with a universe, this element specifies the angles in
@@ -1172,7 +1175,7 @@ implemented in openMC:
 ``<plot>`` Element
 ------------------
 
-Each plot must contain a combination of the following attributes or
+Each plot is specified by a combination of the following attributes or
 sub-elements:
 
   :id:
@@ -1193,6 +1196,18 @@ sub-elements:
 
     *Default*: ``cell``
 
+  :level:
+    Universe depth to plot at (optional).  This parameter controls how many
+    universe levels deep to pull cell and material ids from when setting plot
+    colors.  If a given location does not have as many levels as specified,
+    colors will be taken from the lowest level at that location. For example, if
+    ``level`` is set to zero colors will be taken from top-level (universe zero)
+    cells only.  However, if ``level`` is set to 1 colors will be taken from
+    cells in universes that fill top-level fill-cells, and from top-level cells
+    that contain materials.
+
+    *Default*: Whatever the deepest universe is in the model
+
   :origin:
     Specifies the (x,y,z) coordinate of the center of the plot.  Should be three
     floats separated by spaces.