Commit graph

89 commits

Author SHA1 Message Date
Paul Romano
4ca33a4a04 Make tallies of the form (scalar op usertally) derived 2015-08-15 09:45:14 +07:00
Sterling Harper
6ecc9ae6a1 Fix clean_xml.py indentation 2015-08-13 20:51:27 -06:00
Paul Romano
5e391db9fe Merge branch 'develop' into python-api-notebooks 2015-08-12 09:05:49 +07:00
Will Boyd
817403ae79 Now set num_score_bins attribute for derived tallies in arithmetic operations 2015-08-11 18:44:22 -07:00
Paul Romano
4c2896654d Merge branch 'develop' into python-api-notebooks 2015-08-11 13:39:51 +07:00
Will Boyd
788e03b208 Fixed filter indexing issue in Tally.get_values(...) introduced in #426 2015-08-10 19:10:01 -07:00
Paul Romano
8fd058a11e Use property decorators for Lattice.outer 2015-08-10 12:57:35 +07:00
Paul Romano
e550a8de27 Fix bug in get_unique_universes introduced by #425 2015-08-10 06:54:02 +07:00
Sterling Harper
8a31f2f242 Merge remote-tracking branch 'upstream/develop' into pyapi_lattice_outer
Conflicts:
	openmc/filter.py
2015-08-07 20:39:00 -06:00
Sterling Harper
65679c2220 Small fixes for #425 2015-08-07 20:36:21 -06:00
Will Boyd
d0dde6f5a8 Changed reverse iteration of filter bins, indices to use reversed(...) 2015-08-07 07:31:10 -07:00
Will Boyd
1154c07438 Refactored Tally._outer_product(...) and operator overloads per @paulromano suggestion 2015-08-06 23:41:38 -07:00
Will Boyd
9db3a343ca Made all tallies created with tally arithmetic have name "derived" 2015-08-06 23:12:22 -07:00
Will Boyd
3890ed4d67 Simplified tile and repeat factors in Tally._align_tally_data() 2015-08-06 23:03:50 -07:00
Will Boyd
39ecaa225b Simplified filter index building in Tally.get_values(...) per @paulromanos comments 2015-08-06 22:53:48 -07:00
Sterling Harper
76e6133512 Merge remote-tracking branch 'upstream/develop' into pyapi_lattice_outer
Conflicts:
	openmc/checkvalue.py
	openmc/filter.py
2015-08-05 19:24:42 -06:00
Sterling Harper
1dca4d842b Fix hex lattices in HDF5 summary 2015-08-05 19:10:03 -06:00
Will Boyd
ae39ef8ce8 Fixed merge conflicts with develop 2015-08-05 08:16:43 -07:00
Will Boyd
0ee4df0f2a Removed extraneous quotes from Tally.get_pandas_dataframe(...) 2015-08-04 22:00:07 -07:00
Will Boyd
4ed34c43c5 Removed extraneous quotes from Universe and its subclasses 2015-08-04 21:45:42 -07:00
Will Boyd
f637926550 Removed quotes from Universe.create_xml_subelement 2015-08-04 21:43:02 -07:00
Will Boyd
3b46d31741 Removed double quotes from Trigger.add_score 2015-08-04 21:40:57 -07:00
Will Boyd
df371b6857 Removed extraneous quotes from Tally.get_tally_xml 2015-08-04 21:39:11 -07:00
Will Boyd
547acb2ecc Removed extraneous quotes in __repr__ methods 2015-08-04 21:36:18 -07:00
Will Boyd
ff12e253af Fixed double quotes in filter.py 2015-08-04 21:33:34 -07:00
Will Boyd
a11c1993c6 Added get_bin_index, __hash__ and __deepcopy__ methods to CrossFilter 2015-08-03 22:02:44 -07:00
Will Boyd
c4c1702391 Merge branch 'develop' into tally-arithmetic 2015-08-03 21:49:09 -07:00
Will Boyd
d0afb964b7 Removed quotations around string args in __repr__ methods 2015-08-03 21:48:45 -07:00
Will Boyd
f012c03e2b Removed quotes from string args in ace.py 2015-08-03 21:34:03 -07:00
Will Boyd
bf15c255c3 Added double quotes around exception msgs in Python API 2015-08-03 21:32:06 -07:00
Sterling Harper
cd4fa9a649 Fix 'atom/b-cm' density type in PyAPI 2015-08-03 21:55:08 -06:00
Will Boyd
f38c3bccfa Removed extraneous README comment 2015-08-03 00:28:13 -07:00
Will Boyd
0625350869 Added __eq__ methods to CrossXXX classes to allow for Tally.get_values with derived Tallies 2015-08-03 00:26:42 -07:00
Will Boyd
fa57c16e7e Renamed _CrossXXX class types to CrossXXX 2015-08-03 00:00:40 -07:00
Will Boyd
79055493e0 Shortened nuclide slice block and added docstring to Tally.slice 2015-08-02 23:52:36 -07:00
Will Boyd
587062ad39 Fixed Tally.get_values(...) bug with filter strides 2015-08-02 23:19:46 -07:00
Will Boyd
7ba69d893b Made Tally.get_values(...) not NumPy squeeze data. Fixed bug in doubly used loop iterator i in Tally.slice(...) 2015-08-02 01:20:30 -07:00
Will Boyd
ce147bd68d Tally slice routine now corrects new tally filter strides 2015-08-01 22:49:53 -07:00
Sterling Harper
2cda46e384 Fix Numpy type issue
Numpy integer types aren't recognized as an instance of Integral, at least not with numpy 1.8.2
2015-08-01 22:00:38 -06:00
Will Boyd
1252dc8689 Fixed split filter loop 2015-07-30 07:57:52 -07:00
Will Boyd
2db8bbe060 Now initialize mean and std_dev to None in Tally.slice(...) 2015-07-29 23:55:17 -07:00
Will Boyd
48a3ffef8d Removed Cross class objects for Filters, Nuclides and scores 2015-07-29 23:49:12 -07:00
Will Boyd
e8ab4b9731 Removed Tally summation, minimum and maximum routines 2015-07-29 23:18:59 -07:00
Will Boyd
f6128ff387 Added docstrings to tally arithmetic routines 2015-07-29 18:47:42 -07:00
Will Boyd
67fb220ada Renamed Tally._cross_product as Tally._outer_product 2015-07-29 18:04:39 -07:00
Will Boyd
dea42d7208 Created new Tally._cross_product(...) routine 2015-07-29 00:39:34 -07:00
Will Boyd
8ecc3c115c Continued cleanup and modularization of tally arithmetic routines 2015-07-29 00:06:07 -07:00
Sterling Harper
315236ea58 Fix PyAPI HexLattice.get_unique_universes()
closes #413
2015-07-27 20:24:10 -06:00
Will Boyd
65383dbce4 Abstracted cross product datatypes into new cross.py 2015-07-26 23:17:59 -07:00
Will Boyd
c36ea824ac Fixed Tally.add_score to accept _CrossScore types 2015-07-26 23:14:17 -07:00