Commit graph

7412 commits

Author SHA1 Message Date
Jose Salcedo Perez
52173756f6 More cleaning-up, fixing style and comments. 2018-06-15 01:18:38 +00:00
Jose Salcedo Perez
2602bef154 fixing indentations and level-spacing. Changed index in 'nuclide_header.f90'
line 891 from 4 to 1 (n,gamma) to account for the re-ordering of DEPLETION_RX.
2018-06-05 19:11:45 +00:00
Jose Salcedo Perez
9857f46231 making sure CMakelist.f90 and simulation.f90
match their corresponding files in the develop
branch.
2018-05-28 18:13:59 +00:00
Jose Salcedo Perez
6a53e61c96 Updating tallies.xml 2018-05-28 13:24:30 +00:00
Jose Salcedo Perez
0af6b4bee0 Changed logic in depletion-xs construction to skip (n,3n) and (n,4n) if
energy index is below the threshold for (n,2n). If we are above (n,2n) but
below (n,3n) then we skip (n,4n) automatically.

I also took (n,gamma) outside of that loop since it is not really a
threshold reaction.
2018-05-24 20:27:15 +00:00
Jose Salcedo Perez
70e45b3763 Adding Mesh tallies.
Merge branch 'develop' of https://github.com/mit-crpg/openmc into new-update
2018-05-24 19:39:52 +00:00
Sterling Harper
ae8395e0e4
Merge pull request #1008 from tjlaboss/mesh_from_lattice
Create a Mesh from an existing lattice
2018-05-23 17:56:58 -04:00
Paul Romano
0ea787fccf
Merge pull request #1011 from lindsayad/tally-sum-sq-1010
Consistently check derived for sum and sum_sq in tallies
2018-05-23 16:27:39 -05:00
Alex Lindsay
2e6b40cb1b Consistently check derived for sum and sum_sq in tallies. Closes #1010 2018-05-23 14:16:17 -06:00
Jose Salcedo Perez
92f147d387 Updating my local OpenMC.
Merge branch 'develop' of https://github.com/mit-crpg/openmc into new-update
2018-05-23 19:18:36 +00:00
tjlaboss
36e2ea6b8a Avoid instantiating a Mesh during class method 2018-05-23 11:51:26 -04:00
tjlaboss
7801761a70 Correct names of fixtures
`rlat2d` --> `rlat2`
`rlat3d` --> `rlat3`
2018-05-22 23:49:07 -04:00
tjlaboss
0da329e0ae Unit test for Mesh.from_rect_lattice() 2018-05-22 17:04:07 -04:00
Paul Romano
cacde822f9
Merge pull request #997 from lindsayad/tally-filter-api
Expand C API, targeting FETs
2018-05-22 15:17:19 -05:00
tjlaboss
75dc4131dc Long live PEP8 2018-05-22 13:36:50 -04:00
Alex Lindsay
7c01594111 Add init methods (with order) for capi expansion filters 2018-05-22 08:12:49 -06:00
Alex Lindsay
609877e131 Give up on setter test for now. 2018-05-21 15:22:06 -06:00
Alex Lindsay
85e6eb9616 hitting out of bounds error in fortran 2018-05-21 15:22:06 -06:00
Alex Lindsay
5a863215f3 Take char* instead of char** 2018-05-21 15:22:06 -06:00
Alex Lindsay
411fd288ea Expand C API, targeting FETs 2018-05-21 15:22:06 -06:00
tjlaboss
a47f3abbde New class method, Mesh.fromRectLattice() 2018-05-21 17:13:37 -04:00
Paul Romano
e3f0bff0f0
Merge pull request #1007 from smharper/distrib_order
Swap RectLattice distribcell ordering
2018-05-19 15:38:10 -05:00
Paul Romano
04441ca619
Merge pull request #1004 from nelsonag/cpp_math
Convert math.f90 to C++
2018-05-19 15:24:29 -05:00
Adam G Nelson
890a1b4f55 Moved math python api to point to the C++ and simplified the fortran methods 2018-05-18 19:07:34 -04:00
Adam G Nelson
38c13994bc Implementing comments from @paulromano, @smharper, and @giudgiud. A few remain open, will close in a day or two after some more GitHub discussion 2018-05-16 21:25:29 -04:00
Sterling Harper
f223c2738f Swap RectLattice distribcell ordering 2018-05-16 18:17:23 -04:00
Sterling Harper
3d921c2e3d
Merge pull request #1006 from hanzhuoran/checkvaluebug
Checkvalue bug
2018-05-16 17:28:36 -04:00
Zhuoran Han
873523072d Split the lines for code format. 2018-05-16 15:43:10 -04:00
Zhuoran Han
4c5bdd4438 Checkvalue bug 2018-05-16 14:54:24 -04:00
Adam G Nelson
235974df66 Resolving @smharpers comments, and anticipating this will fix the travis build issue 2018-05-14 20:24:38 -04:00
Adam G Nelson
aaef39d710 fixing compiler errors 2018-05-14 07:09:07 -04:00
Adam G Nelson
d7b20fb51e final preps for a PR 2018-05-13 19:21:36 -04:00
Adam G Nelson
a6e75c3509 Cleaned up the optional parameters interface of rotate_angle 2018-05-13 06:44:48 -04:00
Adam G Nelson
a73f633d24 Converted calc_rn and calc_pn to provide all values at once instead of only for the requested value of n. Also converted calc_pn to use the recursive definition of the legendre polys 2018-05-12 15:43:05 -04:00
Jose Salcedo Perez
2452747a9b Merge branch 'develop' of https://github.com/mit-crpg/openmc into new-update
merging commit 1004
2018-05-12 01:10:26 +00:00
Adam G Nelson
c65817a0d3 Merged with upstream MGXS Expansion changes and Zernike normalization change 2018-05-11 05:02:07 -04:00
Paul Romano
6fa9b02b4d
Merge pull request #1003 from lindsayad/consistent-norms
Use consistent normalization for Zernikes
2018-05-09 06:34:05 -05:00
Alex Lindsay
72d84bc286 Use consistent normalization for Zernikes. 2018-05-08 15:36:02 -06:00
Paul Romano
d5bc4dacae
Merge pull request #1001 from nelsonag/mgxs_expansion_with_tests
Incorporation of Expansion filters in to MGXS
2018-05-08 14:58:41 -05:00
Adam G Nelson
382835960b removed errant print statements in regression_tests/tallies/test.py 2018-05-08 15:02:23 -04:00
Adam G Nelson
044934f93d Implemented broaden_wmp_polynomials in C++ 2018-05-07 20:07:05 -04:00
Adam G Nelson
468126f8c4 Added in Zernike polynomials to C++ code 2018-05-06 20:14:54 -04:00
Adam G Nelson
feecf0134e Incorporated maxwell and watt_spectrum C++ code, tests pass 2018-05-06 11:28:05 -04:00
Adam G Nelson
2000b4f998 Merging with the upstream, especially including hdf5 C++ changes 2018-05-06 07:16:21 -04:00
Adam G Nelson
758f0b3087 updating tests now that I know the std dev issue 2018-05-05 16:55:13 -04:00
Adam G Nelson
6d84ed8d53 Resetting mgxs_library_histogram test results back to before the MGXS Api changes so I can more easily see progress 2018-05-05 11:20:13 -04:00
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
Giud
7a67ec02e2
Merge pull request #1000 from paulromano/latouter-fix
Fix bug when no outer lattice universe is defined
2018-05-02 17:58:00 -04:00