From 66e2d1f63c70fa67cef435583a6d4ab360ffcf4a Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Thu, 7 Feb 2019 23:48:54 -0500 Subject: [PATCH] Fix MG mode bugs for inverse-vel and decay tallies --- src/tallies/tally.F90 | 8 ++++---- src/xsdata.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tallies/tally.F90 b/src/tallies/tally.F90 index 20087eab7..ad94000e9 100644 --- a/src/tallies/tally.F90 +++ b/src/tallies/tally.F90 @@ -1349,11 +1349,11 @@ contains if (i_nuclide > 0) then score = score * flux * get_nuclide_xs_c(i_nuclide, & MG_GET_XS_INVERSE_VELOCITY, p_g) / & - get_macro_xs_c(p % material, MG_GET_XS_ABSORPTION, p_g) + get_macro_xs_c(p % material, MG_GET_XS_TOTAL, p_g) else score = score * flux * get_macro_xs_c(p % material, & MG_GET_XS_INVERSE_VELOCITY, p_g) / & - get_macro_xs_c(p % material, MG_GET_XS_ABSORPTION, p_g) + get_macro_xs_c(p % material, MG_GET_XS_TOTAL, p_g) end if else @@ -1843,13 +1843,13 @@ contains if (i_nuclide > 0) then score = score + keff * atom_density * & fission_bank_wgt(n_bank - p % n_bank + k) * & - get_nuclide_xs_c(i_nuclide, MG_GET_XS_DECAY_RATE, p_g, DG=d) * & + get_nuclide_xs_c(i_nuclide, MG_GET_XS_DECAY_RATE, p_g, DG=g) * & get_nuclide_xs_c(i_nuclide, MG_GET_XS_FISSION, p_g) / & get_macro_xs_c(p % material, MG_GET_XS_FISSION, p_g) * flux else score = score + keff * & fission_bank_wgt(n_bank - p % n_bank + k) * & - get_macro_xs_c(p % material, MG_GET_XS_DECAY_RATE, p_g, DG=d) * flux + get_macro_xs_c(p % material, MG_GET_XS_DECAY_RATE, p_g, DG=g) * flux end if ! if the delayed group filter is present, tally to corresponding diff --git a/src/xsdata.cpp b/src/xsdata.cpp index 347793e5b..cee36a938 100644 --- a/src/xsdata.cpp +++ b/src/xsdata.cpp @@ -92,7 +92,7 @@ XsData::from_hdf5(hid_t xsdata_grp, bool fissionable, int scatter_format, fission_from_hdf5(xsdata_grp, n_ang, is_isotropic); } // Get the non-fission-specific data - read_nd_vector(xsdata_grp, "decay_rate", decay_rate); + read_nd_vector(xsdata_grp, "decay rate", decay_rate); read_nd_vector(xsdata_grp, "absorption", absorption, true); read_nd_vector(xsdata_grp, "inverse-velocity", inverse_velocity);