Merge remote-tracking branch 'upstream/develop' into incoming-current

This commit is contained in:
Sam Shaner 2016-08-31 07:06:02 -04:00
commit 2357dee05f
10 changed files with 1075 additions and 56 deletions

View file

@ -334,6 +334,7 @@ Functions
:nosignatures:
openmc.model.create_triso_lattice
openmc.model.pack_trisos
--------------------------------------------
:mod:`openmc.data` -- Nuclear Data Interface