Commit graph

495 commits

Author SHA1 Message Date
Adam G Nelson
45d9234fdf Fixing df.drop call using newer pandas syntax instead of backwards-compatible syntax 2018-05-05 11:15:11 -04:00
Adam G Nelson
cd300249f2 merging in the MGXS Expansion changes and fixing the correction when consistent is applied 2018-05-05 10:44:17 -04:00
Adam G Nelson
968c12deb5 Fixed consistent scatter matrix filter ordering so tests come out consistently and added a mgxs_library_correction and mgxs_library_histogram test 2018-05-05 09:24:21 -04:00
Adam G Nelson
b61c67a12c fixes per request of @paulromano: fixing test scratch files vice using .gitignore, minor typo in docs, and some otherwise small code cleanups 2018-05-01 19:17:21 -04:00
Adam G Nelson
1d2ebb71f8 Implemented Expansion filters in to the MGXS classes and removed the old score-based expansions 2018-04-27 19:45:38 -04:00
Paul Romano
d41ac48467 Force all filters to have a .bins attribute that makes sense 2018-03-28 15:56:03 -05:00
Paul Romano
bd5b7afc2d Fix bug related to bin ordering for mesh filters 2018-03-16 13:47:01 -05:00
Paul Romano
8487915f2a Use ufloat for k_combined in statepoint 2018-03-15 11:02:07 -05:00
Paul Romano
d3d6dc87dc Remove a few more __future__ imports. Use collections.abc 2018-02-05 23:14:30 -05:00
Paul Romano
deab4b3d33 Use empty-argument form of super() 2018-02-05 23:14:30 -05:00
Paul Romano
c428cee667 Remove __future__ and six imports 2018-02-05 23:14:30 -05:00
Paul Romano
68a01b8fc1 Explicitly use int(floor(...)) for Python 2 compatibility 2018-02-05 07:35:48 -06:00
Sterling Harper
a149ef42a0
Merge pull request #946 from paulromano/eq-hash
Ensure mutable objects are not hashable
2017-12-20 01:51:12 -05:00
Paul Romano
e6b5803f70 Make filter_strides a property of Tally 2017-12-19 15:58:14 +07:00
Sterling Harper
0460d9a538 Allow optional 'latest' libver for HDF5 xs data 2017-12-17 19:48:08 -05:00
Sterling Harper
f754357aea Use 'earliest' libver in h5py for backwards-compat 2017-12-16 19:56:34 -05:00
Paul Romano
02b8f4ec09 Change names of openmc.capi classes. Hopefully fix RTD docs build. 2017-10-05 10:52:29 -05:00
Will Boyd
66c50ed59d Made fast summary primitive collections private 2017-05-04 14:58:30 -04:00
Will Boyd
d404624060 Merge branch 'openmoc-complex-regions' of github.com:wbinventor/openmc into openmoc-complex-regions 2017-05-02 15:41:04 -04:00
Will Boyd
a9f6a5314b Merge remote-tracking branch 'upstream/develop' into openmoc-complex-regions 2017-05-02 15:40:50 -04:00
Will Boyd
d8164952d0 Cleaned up rxn_rate_tally property for consistent scattering matrices 2017-04-11 13:12:55 -04:00
Will Boyd
5bc55d4a81 Simplified code for xs_tally property for consistent scattering matrices 2017-04-11 13:11:53 -04:00
Will Boyd
49aac97804 Fix bugs when using nuclides for consistent scattering matrix MGXS with multiplicity or transport correction 2017-04-11 08:37:00 -04:00
Will Boyd
d359909aa8 Revised order of operations for consistent scattering matrix calculation to work with multiple nuclides 2017-04-10 17:27:28 -04:00
Will Boyd
6de073c6ed Now memoize all geometric primitives in Summary object for fast retrieval by MGXS 2017-03-29 17:30:18 -04:00
Will Boyd
b74c6f065f OpenMOC compatiblity module now supports complex regions; fixed major slow down in MGXS Library statepoint loading 2017-03-15 12:42:01 -04:00
Adam Nelson
2b21eb246b fixed errant histogram scatter matrix printing 2017-03-10 19:36:15 -05:00
Will Boyd
3a8bd3d35d Removed commented out code in consistent scatter matrix per comment by @nelsonag 2017-03-10 18:12:38 -05:00
Will Boyd
2906994115 Fixed normalization of scattering prob matrix with histogram format 2017-03-09 18:55:12 -05:00
Will Boyd
23cf630636 Fixed issue with consistent nu-scatter matrix with Legendre moments 2017-03-09 14:48:49 -05:00
Will Boyd
ea833eab4d Small bug fix for scattering matrix histogram binning 2017-03-09 09:06:13 -05:00
Will Boyd
0c3e586dd2 Tally merging now consolidates moment scores 2017-03-08 14:23:49 -05:00
Will Boyd
23e0207ff2 Merge branch 'new-scatt-mat' of github.com:wbinventor/openmc into new-scatt-mat 2017-03-08 09:32:31 -05:00
Will Boyd
b3687b48ee Merge remote-tracking branch 'upstream/develop' into new-scatt-mat 2017-03-07 13:53:33 -05:00
Will Boyd
a42d492a30 Fixed filters for normalization of scattering probability matrix with angular histogram representation 2017-03-07 11:38:44 -05:00
Will Boyd
0352849b1a Updated test results with new consistent transport-corrected total MGXS 2017-03-07 09:23:12 -05:00
Will Boyd
4be0e58be8 Added support for histograms to consistent scattering matrix 2017-03-06 13:59:22 -05:00
Will Boyd
2e0ade3bc7 Removed errant filters added to scatter probability matrix for consistent multi-group scattering matrix 2017-03-06 13:46:19 -05:00
Paul Romano
2d1897a051 Remove offsets, distribcell_index, distribcell_paths 2017-03-06 12:36:48 -06:00
Will Boyd
04c0f3910d Removed errant filters added to scatter probability matrix for consistent multi-group scattering matrix 2017-03-06 13:22:14 -05:00
Will Boyd
10f8e20090 Fixed issue with scatter matrix transport correction filter 2017-03-05 10:32:43 -05:00
Will Boyd
aa76e16bbf Added HDF5 key for scatter probability matrix 2017-03-03 11:29:02 -05:00
Will Boyd
2ab390c75b Refactored openmc.mgxs.ScatterProbabilityMatrix to only calculate for scattering moment probabilities 2017-03-03 11:16:44 -05:00
Will Boyd
99db48bc8e Updated equations in new consistent scattering matrix 2017-03-02 17:16:32 -05:00
Will Boyd
604bfbfbe1 Added formulation property to ScatterMatrixXS 2017-03-02 17:02:08 -05:00
Will Boyd
671a9cf693 Revised equations for consistent scattering matrix 2017-03-02 10:14:40 -05:00
Will Boyd
e33855047a Fixed merge conflicts with develop branch 2017-03-02 09:51:13 -05:00
Will Boyd
6d092292bc Updated test results with Legendre moments for consistent scattering matrices 2017-03-02 09:49:54 -05:00
Will Boyd
1dc199e2f4 Added Legendre moments back to consistent scattering matrix 2017-03-02 09:35:46 -05:00
Will Boyd
b1fbef35e9 Merge pull request #800 from paulromano/volume
Change how volume is handled
2017-03-02 09:06:44 -05:00