Fixed merge conflicts with develop

This commit is contained in:
Will Boyd 2017-02-19 17:04:14 -05:00
commit 24146ecfa0
135 changed files with 1762 additions and 980 deletions

View file

@ -115,6 +115,19 @@ Many of the above classes are derived from several abstract classes:
openmc.Region
openmc.Lattice
Two helper function are also available to create rectangular and hexagonal
prisms defined by the intersection of four and six surface half-spaces,
respectively.
.. autosummary::
:toctree: generated
:nosignatures:
:template: myfunction.rst
openmc.get_hexagonal_prism
openmc.get_rectangular_prism
>>>>>>> upstream/develop
Constructing Tallies
--------------------