Merging with upstream.

docs/source/releasenotes/notes_0.5.0.rst

@@ -32,6 +32,9 @@ New Features
 Bug Fixes
 ---------
 
+- 737b90_: Coincident surfaces from separate universes / particle traveling
+  tangent to a surface.
+- a819b4_: Output of surface neighbors in summary.out file.
 - b11696_: Reading long attribute lists in XML input.
 - 2bd46a_: Search for tallying nuclides when no default_xs specified.
 - 7a1f08_: Fix word wrapping when writing messages.
@@ -39,6 +42,8 @@ Bug Fixes
 - 6f8d9d_: Set default tally labels.
 - 6a3a5e_: Fix problem with corner-crossing in lattices.
 
+.. _737b90: https://github.com/mit-crpg/openmc/commit/737b90
+.. _a819b4: https://github.com/mit-crpg/openmc/commit/a819b4
 .. _b11696: https://github.com/mit-crpg/openmc/commit/b11696
 .. _2bd46a: https://github.com/mit-crpg/openmc/commit/2bd46a
 .. _7a1f08: https://github.com/mit-crpg/openmc/commit/7a1f08

docs/source/usersguide/input.rst

@@ -69,37 +69,6 @@ deviation.
 
   *Default*: off
 
-``<criticality>`` Element
--------------------------
-
-The ``<criticality>`` element indicates that a criticality calculation should be
-performed. It has the following attributes/sub-elements:
-
-  :batches: 
-    The total number of batches, where each batch corresponds to multiple
-    fission source iterations. Batching is done to eliminate correlation between
-    realizations of random variables.
-
-    *Default*: None
-
-  :generations_per_batch:
-    The number of total fission source iterations per batch.
-
-    *Default*: 1
-
-  :inactive:
-    The number of inactive batches. In general, the starting cycles in a
-    criticality calculation can not be used to contribute to tallies since the
-    fission source distribution and eigenvalue are generally not converged
-    immediately.
-
-    *Default*: None
-
-  :particles:
-    The number of neutrons to simulate per fission source iteration.
-
-    *Default*: None
-
 .. _cross_sections:
 
 ``<cross_sections>`` Element
@@ -130,6 +99,37 @@ default. This element has the following attributes/sub-elements:
 
     *Default*: 1.0
 
+``<eigenvalue>`` Element
+------------------------
+
+The ``<eigenvalue>`` element indicates that a :math:`k`-eigenvalue calculation
+should be performed. It has the following attributes/sub-elements:
+
+  :batches: 
+    The total number of batches, where each batch corresponds to multiple
+    fission source iterations. Batching is done to eliminate correlation between
+    realizations of random variables.
+
+    *Default*: None
+
+  :generations_per_batch:
+    The number of total fission source iterations per batch.
+
+    *Default*: 1
+
+  :inactive:
+    The number of inactive batches. In general, the starting cycles in a
+    criticality calculation can not be used to contribute to tallies since the
+    fission source distribution and eigenvalue are generally not converged
+    immediately.
+
+    *Default*: None
+
+  :particles:
+    The number of neutrons to simulate per fission source iteration.
+
+    *Default*: None
+
 ``<energy_grid>`` Element
 -------------------------