amandalund 375125c603 Merge branch 'develop' into separate_filters ... * develop: (91 commits) Update resonance scattering test result removed additional unnecessary modifications removed unnecessary modifications updated to only modify the _swap_filters method Check for elastic scattering with isotropic mu. changed == to is fixed issue in tallies.py in making sure static copy of other filter gets updated and updated tests fixed bug for misaligned energy and energyout filters When 1 temp is available, revert to nearest temp on all processes added other_old to _swap_filter method fixed tally alignment method in tallies.py Make sure get_pandas_dataframe() works with 1D mesh filter Fix bug with SurfaceFilter bin ordering Check for void materials in tracklength tallies Make sure source is in geometry before fiss. check Make parent class for filters with IDed objects Allow objects in addition to ids in Filters Cleaned up rxn_rate_tally property for consistent scattering matrices Simplified code for xs_tally property for consistent scattering matrices Update inputs for test_diff_tally ... Conflicts: openmc/filter.py src/output.F90		2017-04-30 17:41:38 -05:00
..
diagrams	Added two UML diagrams.	2011-10-11 11:59:25 -04:00
source	Merge branch 'develop' into separate_filters	2017-04-30 17:41:38 -05:00
sphinxext	Documentation changes to build on Read The Docs	2016-01-04 10:56:45 -06:00
Makefile	Add Plot.from_geometry() classmethod	2017-03-08 14:24:41 -06:00
requirements-rtd.txt	Documentation changes to build on Read The Docs	2016-01-04 10:56:45 -06:00