merging with upstream

This commit is contained in:
Adam Nelson 2016-11-19 05:33:05 -05:00
commit ea8181f2b6
57 changed files with 3543 additions and 710 deletions

View file

@ -293,6 +293,7 @@ Multi-group Cross Sections
openmc.mgxs.NuScatterXS
openmc.mgxs.NuScatterMatrixXS
openmc.mgxs.PromptNuFissionXS
openmc.mgxs.PromptNuFissionMatrixXS
openmc.mgxs.ScatterXS
openmc.mgxs.ScatterMatrixXS
openmc.mgxs.TotalXS
@ -309,6 +310,7 @@ Multi-delayed-group Cross Sections
openmc.mgxs.MDGXS
openmc.mgxs.ChiDelayed
openmc.mgxs.DelayedNuFissionXS
openmc.mgxs.DelayedNuFissionMatrixXS
openmc.mgxs.Beta
openmc.mgxs.DecayRate