diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index 232e9bfe46..4f8e4b6c0c 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -1253,17 +1253,87 @@ The ```` element accepts the following sub-elements: :energy: A monotonically increasing list of bounding **pre-collision** energies for a number of groups. For example, if this filter is specified as - ````, then two energy bins - will be created, one with energies between 0 and 1 MeV and the other - with energies between 1 and 20 MeV. + + .. code-block:: xml + + + + then two energy bins will be created, one with energies between 0 and + 1 MeV and the other with energies between 1 and 20 MeV. :energyout: A monotonically increasing list of bounding **post-collision** energies for a number of groups. For example, if this filter is - specified as ````, then - two post-collision energy bins will be created, one with energies + specified as + + .. code-block:: xml + + + + then two post-collision energy bins will be created, one with energies between 0 and 1 MeV and the other with energies between 1 and 20 MeV. + :mu: + A monotonically increasing list of bounding **post-collision** cosines + of the change in a particle's angle (i.e., :math:`\mu = \hat{\Omega} + \cdot \hat{\Omega}'`), which represents a portion of the possible + values of :math:`[-1,1]`. For example, spanning all of :math:`[-1,1]` + with five equi-width bins can be specified as: + + .. code-block:: xml + + + + Alternatively, if only one value is provided as a bin, OpenMC will + interpret this to mean the complete range of :math:`[-1,1]` should + be automatically subdivided in to the provided value for the bin. + That is, the above example of five equi-width bins spanning + :math:`[-1,1]` can be instead written as: + + .. code-block:: xml + + + + :polar: + A monotonically increasing list of bounding particle polar angles + which represents a portion of the possible values of :math:`[0,\pi]`. + For example, spanning all of :math:`[0,\pi]` with five equi-width + bins can be specified as: + + .. code-block:: xml + + + + Alternatively, if only one value is provided as a bin, OpenMC will + interpret this to mean the complete range of :math:`[0,\pi]` should + be automatically subdivided in to the provided value for the bin. + That is, the above example of five equi-width bins spanning + :math:`[0,\pi]` can be instead written as: + + .. code-block:: xml + + + + :azimuthal: + A monotonically increasing list of bounding particle azimuthal angles + which represents a portion of the possible values of :math:`[-\pi,\pi)`. + For example, spanning all of :math:`[-\pi,\pi)` with two equi-width + bins can be specified as: + + .. code-block:: xml + + + + Alternatively, if only one value is provided as a bin, OpenMC will + interpret this to mean the complete range of :math:`[-\pi,\pi)` should + be automatically subdivided in to the provided value for the bin. + That is, the above example of five equi-width bins spanning + :math:`[-\pi,\pi)` can be instead written as: + + .. code-block:: xml + + + :mesh: The ``id`` of a structured mesh to be tallied over. diff --git a/openmc/filter.py b/openmc/filter.py index fc217a4108..bd42039ed8 100644 --- a/openmc/filter.py +++ b/openmc/filter.py @@ -9,7 +9,8 @@ from openmc.checkvalue import check_type, check_iterable_type, \ check_greater_than, _isinstance _FILTER_TYPES = ['universe', 'material', 'cell', 'cellborn', 'surface', - 'mesh', 'energy', 'energyout', 'distribcell', 'delayedgroup'] + 'mesh', 'energy', 'energyout', 'mu', 'polar', 'azimuthal', + 'distribcell', 'delayedgroup'] class Filter(object): """A filter used to constrain a tally to a specific criterion, e.g. only tally diff --git a/openmc/tallies.py b/openmc/tallies.py index a1206f012a..a0f617d08c 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -427,7 +427,7 @@ class Tally(object): if score in self.scores: return else: - self._scores.append(score) + self._scores.append(score.strip()) @num_score_bins.setter def num_score_bins(self, num_score_bins): @@ -1267,12 +1267,11 @@ class Tally(object): # energy, energyout filters elif 'energy' in filter.type: bins = filter.bins - num_bins = filter.num_bins - # Create strings for + # Create strings for dataFrame rows template = '{0:.1e} - {1:.1e}' filter_bins = [] - for i in range(num_bins): + for i in range(filter.num_bins): filter_bins.append(template.format(bins[i], bins[i+1])) # Tile the energy bins into a DataFrame column @@ -1281,6 +1280,22 @@ class Tally(object): filter_bins = np.tile(filter_bins, tile_factor) df[filter.type + ' [MeV]'] = filter_bins + # mu, polar, and azimuthal + elif filter.type in ['mu', 'polar', 'azimuthal']: + bins = filter.bins + + # Create strings for dataFrame rows + template = '{0:1.2f} - {1:1.2f}' + filter_bins = [] + for i in range(filter.num_bins): + filter_bins.append(template.format(bins[i], bins[i+1])) + + # Tile the bins into a DataFrame column + filter_bins = np.repeat(filter_bins, filter.stride) + tile_factor = data_size / len(filter_bins) + filter_bins = np.tile(filter_bins, tile_factor) + df[filter.type] = filter_bins + # universe, material, surface, cell, and cellborn filters else: filter_bins = np.repeat(filter.bins, filter.stride) diff --git a/src/constants.F90 b/src/constants.F90 index bda63598ca..9e973f24af 100644 --- a/src/constants.F90 +++ b/src/constants.F90 @@ -302,18 +302,21 @@ module constants integer, parameter :: NO_BIN_FOUND = -1 ! Tally filter and map types - integer, parameter :: N_FILTER_TYPES = 10 + integer, parameter :: N_FILTER_TYPES = 13 integer, parameter :: & - FILTER_UNIVERSE = 1, & - FILTER_MATERIAL = 2, & - FILTER_CELL = 3, & - FILTER_CELLBORN = 4, & - FILTER_SURFACE = 5, & - FILTER_MESH = 6, & - FILTER_ENERGYIN = 7, & - FILTER_ENERGYOUT = 8, & - FILTER_DISTRIBCELL = 9, & - FILTER_DELAYEDGROUP = 10 + FILTER_UNIVERSE = 1, & + FILTER_MATERIAL = 2, & + FILTER_CELL = 3, & + FILTER_CELLBORN = 4, & + FILTER_SURFACE = 5, & + FILTER_MESH = 6, & + FILTER_ENERGYIN = 7, & + FILTER_ENERGYOUT = 8, & + FILTER_DISTRIBCELL = 9, & + FILTER_MU = 10, & + FILTER_POLAR = 11, & + FILTER_AZIMUTHAL = 12, & + FILTER_DELAYEDGROUP = 13 ! Mesh types integer, parameter :: & diff --git a/src/input_xml.F90 b/src/input_xml.F90 index dd9220ebd0..62aad18f22 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2165,6 +2165,9 @@ contains integer :: imomstr ! Index of MOMENT_STRS & MOMENT_N_STRS logical :: file_exists ! does tallies.xml file exist? real(8) :: rarray3(3) ! temporary double prec. array + integer :: Nangle ! Number of angular bins + real(8) :: dangle ! Mu spacing if using automatic allocation + integer :: iangle ! Loop counter for building mu filter bins character(MAX_LINE_LEN) :: filename character(MAX_WORD_LEN) :: word character(MAX_WORD_LEN) :: score_name @@ -2432,8 +2435,9 @@ contains ! Determine number of bins if (check_for_node(node_filt, "bins")) then - if (trim(temp_str) == 'energy' .or. & - trim(temp_str) == 'energyout') then + if (temp_str == 'energy' .or. temp_str == 'energyout' .or. & + temp_str == 'mu' .or. temp_str == 'polar' .or. & + temp_str == 'azimuthal') then n_words = get_arraysize_double(node_filt, "bins") else n_words = get_arraysize_integer(node_filt, "bins") @@ -2591,6 +2595,103 @@ contains end if end do + case ('mu') + ! Set type of filter + t % filters(j) % type = FILTER_MU + + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 + + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + + ! Allow a user to input a lone number which will mean that + ! you subivide [-1,1] evenly with the input being the number of bins + if (n_words == 1) then + Nangle = int(t % filters(j) % real_bins(1)) + if (Nangle > 1) then + t % filters(j) % n_bins = Nangle + dangle = TWO / real(Nangle,8) + deallocate(t % filters(j) % real_bins) + allocate(t % filters(j) % real_bins(Nangle + 1)) + do iangle = 1, Nangle + t % filters(j) % real_bins(iangle) = -ONE + (iangle - 1) * dangle + end do + t % filters(j) % real_bins(Nangle + 1) = ONE + else + call fatal_error("Number of bins for mu filter must be& + & greater than 1 on tally " // trim(to_str(t % id)) // ".") + end if + + end if + + ! Set to analog estimator + t % estimator = ESTIMATOR_ANALOG + + case ('polar') + ! Set type of filter + t % filters(j) % type = FILTER_POLAR + + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 + + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + + ! Allow a user to input a lone number which will mean that + ! you subivide [0,pi] evenly with the input being the number of bins + if (n_words == 1) then + Nangle = int(t % filters(j) % real_bins(1)) + if (Nangle > 1) then + t % filters(j) % n_bins = Nangle + dangle = PI / real(Nangle,8) + deallocate(t % filters(j) % real_bins) + allocate(t % filters(j) % real_bins(Nangle + 1)) + do iangle = 1, Nangle + t % filters(j) % real_bins(iangle) = (iangle - 1) * dangle + end do + t % filters(j) % real_bins(Nangle + 1) = PI + else + call fatal_error("Number of bins for polar filter must be& + & greater than 1 on tally " // trim(to_str(t % id)) // ".") + end if + + end if + + case ('azimuthal') + ! Set type of filter + t % filters(j) % type = FILTER_AZIMUTHAL + + ! Set number of bins + t % filters(j) % n_bins = n_words - 1 + + ! Allocate and store bins + allocate(t % filters(j) % real_bins(n_words)) + call get_node_array(node_filt, "bins", t % filters(j) % real_bins) + + ! Allow a user to input a lone number which will mean that + ! you sub-divide [-pi,pi) evenly with the input being the number of + ! bins + if (n_words == 1) then + Nangle = int(t % filters(j) % real_bins(1)) + if (Nangle > 1) then + t % filters(j) % n_bins = Nangle + dangle = TWO * PI / real(Nangle,8) + deallocate(t % filters(j) % real_bins) + allocate(t % filters(j) % real_bins(Nangle + 1)) + do iangle = 1, Nangle + t % filters(j) % real_bins(iangle) = -PI + (iangle - 1) * dangle + end do + t % filters(j) % real_bins(Nangle + 1) = PI + else + call fatal_error("Number of bins for azimuthal filter must be& + & greater than 1 on tally " // trim(to_str(t % id)) // ".") + end if + + end if + case default ! Specified tally filter is invalid, raise error call fatal_error("Unknown filter type '" & @@ -2788,6 +2889,7 @@ contains ! scores then strip off the n and store it as an integer to be used ! later. Then perform the select case on this modified (number ! removed) string + n_order = -1 score_name = sarray(l) do imomstr = 1, size(MOMENT_STRS) if (starts_with(score_name,trim(MOMENT_STRS(imomstr)))) then @@ -2841,6 +2943,23 @@ contains &delayedgroup filter.") end if + ! Check to see if the mu filter is applied and if that makes sense. + if ((.not. starts_with(score_name,'scatter')) .and. & + (.not. starts_with(score_name,'nu-scatter'))) then + if (t % find_filter(FILTER_MU) > 0) then + call fatal_error("Cannot tally " // trim(score_name) //" with a & + &change of angle (mu) filter.") + end if + ! Also check to see if this is a legendre expansion or not. + ! If so, we can accept this score and filter combo for p0, but not + ! elsewhere. + else if (n_order > 0) then + if (t % find_filter(FILTER_MU) > 0) then + call fatal_error("Cannot tally " // trim(score_name) //" with a & + &change of angle (mu) filter unless order is 0.") + end if + end if + select case (trim(score_name)) case ('flux') ! Prohibit user from tallying flux for an individual nuclide diff --git a/src/math.F90 b/src/math.F90 index 826172fa24..6b96baa0d9 100644 --- a/src/math.F90 +++ b/src/math.F90 @@ -181,7 +181,6 @@ contains if (uvw(1) == ZERO) then phi = ZERO else -! phi = atan(uvw(2) / uvw(1)) phi = atan2(uvw(2), uvw(1)) end if @@ -192,364 +191,364 @@ contains rn(1) = ONE case (1) ! l = 1, m = -1 - rn(1) = ONE*sqrt(w2m1) * sin(phi) + rn(1) = -(ONE*sqrt(w2m1) * sin(phi)) ! l = 1, m = 0 rn(2) = ONE * w ! l = 1, m = 1 - rn(3) = ONE*sqrt(w2m1) * cos(phi) + rn(3) = -(ONE*sqrt(w2m1) * cos(phi)) case (2) ! l = 2, m = -2 rn(1) = 0.288675134594813_8 * (-THREE * w**2 + THREE) * sin(TWO*phi) ! l = 2, m = -1 - rn(2) = 1.73205080756888_8 * w*sqrt(w2m1) * sin(phi) + rn(2) = -(1.73205080756888_8 * w*sqrt(w2m1) * sin(phi)) ! l = 2, m = 0 rn(3) = 1.5_8 * w**2 - HALF ! l = 2, m = 1 - rn(4) = 1.73205080756888_8 * w*sqrt(w2m1) * cos(phi) + rn(4) = -(1.73205080756888_8 * w*sqrt(w2m1) * cos(phi)) ! l = 2, m = 2 rn(5) = 0.288675134594813_8 * (-THREE * w**2 + THREE) * cos(TWO*phi) case (3) ! l = 3, m = -3 - rn(1) = 0.790569415042095_8 * (w2m1)**(THREE/TWO) * sin(THREE * phi) + rn(1) = -(0.790569415042095_8 * (w2m1)**(THREE/TWO) * sin(THREE * phi)) ! l = 3, m = -2 rn(2) = 1.93649167310371_8 * w*(w2m1) * sin(TWO*phi) ! l = 3, m = -1 - rn(3) = 0.408248290463863_8*sqrt(w2m1)*((15.0_8/TWO)*w**2 - THREE/TWO) * & - sin(phi) + rn(3) = -(0.408248290463863_8*sqrt(w2m1)*((15.0_8/TWO)*w**2 - THREE/TWO) * & + sin(phi)) ! l = 3, m = 0 rn(4) = 2.5_8 * w**3 - 1.5_8 * w ! l = 3, m = 1 - rn(5) = 0.408248290463863_8*sqrt(w2m1)*((15.0_8/TWO)*w**2 - THREE/TWO) * & - cos(phi) + rn(5) = -(0.408248290463863_8*sqrt(w2m1)*((15.0_8/TWO)*w**2 - THREE/TWO) * & + cos(phi)) ! l = 3, m = 2 rn(6) = 1.93649167310371_8 * w*(w2m1) * cos(TWO*phi) ! l = 3, m = 3 - rn(7) = 0.790569415042095_8 * (w2m1)**(THREE/TWO) * cos(THREE* phi) + rn(7) = -(0.790569415042095_8 * (w2m1)**(THREE/TWO) * cos(THREE* phi)) case (4) ! l = 4, m = -4 rn(1) = 0.739509972887452_8 * (w2m1)**2 * sin(4.0_8*phi) ! l = 4, m = -3 - rn(2) = 2.09165006633519_8 * w*(w2m1)**(THREE/TWO) * sin(THREE* phi) + rn(2) = -(2.09165006633519_8 * w*(w2m1)**(THREE/TWO) * sin(THREE* phi)) ! l = 4, m = -2 rn(3) = 0.074535599249993_8 * (w2m1)*((105.0_8/TWO)*w**2 - 15.0_8/TWO) * & sin(TWO*phi) ! l = 4, m = -1 - rn(4) = 0.316227766016838_8*sqrt(w2m1)*((35.0_8/TWO)*w**3 - 15.0_8/TWO*w)& - * sin(phi) + rn(4) = -(0.316227766016838_8*sqrt(w2m1)*((35.0_8/TWO)*w**3 - 15.0_8/TWO*w)& + * sin(phi)) ! l = 4, m = 0 rn(5) = 4.375_8 * w**4 - 3.75_8 * w**2 + 0.375_8 ! l = 4, m = 1 - rn(6) = 0.316227766016838_8*sqrt(w2m1)*((35.0_8/TWO)*w**3 - 15.0_8/TWO*w)& - * cos(phi) + rn(6) = -(0.316227766016838_8*sqrt(w2m1)*((35.0_8/TWO)*w**3 - 15.0_8/TWO*w)& + * cos(phi)) ! l = 4, m = 2 rn(7) = 0.074535599249993_8 * (w2m1)*((105.0_8/TWO)*w**2 - 15.0_8/TWO) * & cos(TWO*phi) ! l = 4, m = 3 - rn(8) = 2.09165006633519_8 * w*(w2m1)**(THREE/TWO) * cos(THREE* phi) + rn(8) = -(2.09165006633519_8 * w*(w2m1)**(THREE/TWO) * cos(THREE* phi)) ! l = 4, m = 4 rn(9) = 0.739509972887452_8 * (w2m1)**2 * cos(4.0_8*phi) case (5) ! l = 5, m = -5 - rn(1) = 0.701560760020114_8 * (w2m1)**(5.0_8/TWO) * sin(5.0_8*phi) + rn(1) = -(0.701560760020114_8 * (w2m1)**(5.0_8/TWO) * sin(5.0_8*phi)) ! l = 5, m = -4 rn(2) = 2.21852991866236_8 * w*(w2m1)**2 * sin(4.0_8*phi) ! l = 5, m = -3 - rn(3) = 0.00996023841111995_8 * (w2m1)**(THREE/TWO)* & - ((945.0_8 /TWO)*w**2 - 105.0_8/TWO) * sin(THREE*phi) + rn(3) = -(0.00996023841111995_8 * (w2m1)**(THREE/TWO)* & + ((945.0_8 /TWO)*w**2 - 105.0_8/TWO) * sin(THREE*phi)) ! l = 5, m = -2 rn(4) = 0.0487950036474267_8 * (w2m1) & * ((315.0_8/TWO)*w**3 - 105.0_8/TWO*w) * sin(TWO*phi) ! l = 5, m = -1 - rn(5) = 0.258198889747161_8*sqrt(w2m1)* & + rn(5) = -(0.258198889747161_8*sqrt(w2m1)* & ((315.0_8/8.0_8)*w**4 - 105.0_8/4.0_8 * w**2 + 15.0_8/8.0_8) & - * sin(phi) + * sin(phi)) ! l = 5, m = 0 rn(6) = 7.875_8 * w**5 - 8.75_8 * w**3 + 1.875_8 * w ! l = 5, m = 1 - rn(7) = 0.258198889747161_8*sqrt(w2m1)* & + rn(7) = -(0.258198889747161_8*sqrt(w2m1)* & ((315.0_8/8.0_8)*w**4 - 105.0_8/4.0_8 * w**2 + 15.0_8/8.0_8) & - * cos(phi) + * cos(phi)) ! l = 5, m = 2 rn(8) = 0.0487950036474267_8 * (w2m1)* & ((315.0_8/TWO)*w**3 - 105.0_8/TWO*w) * cos(TWO*phi) ! l = 5, m = 3 - rn(9) = 0.00996023841111995_8 * (w2m1)**(THREE/TWO)* & - ((945.0_8 /TWO)*w**2 - 105.0_8/TWO) * cos(THREE*phi) + rn(9) = -(0.00996023841111995_8 * (w2m1)**(THREE/TWO)* & + ((945.0_8 /TWO)*w**2 - 105.0_8/TWO) * cos(THREE*phi)) ! l = 5, m = 4 rn(10) = 2.21852991866236_8 * w*(w2m1)**2 * cos(4.0_8*phi) ! l = 5, m = 5 - rn(11) = 0.701560760020114_8 * (w2m1)**(5.0_8/TWO) * cos(5.0_8* phi) + rn(11) = -(0.701560760020114_8 * (w2m1)**(5.0_8/TWO) * cos(5.0_8* phi)) case (6) ! l = 6, m = -6 rn(1) = 0.671693289381396_8 * (w2m1)**3 * sin(6.0_8*phi) ! l = 6, m = -5 - rn(2) = 2.32681380862329_8 * w*(w2m1)**(5.0_8/TWO) * sin(5.0_8*phi) + rn(2) = -(2.32681380862329_8 * w*(w2m1)**(5.0_8/TWO) * sin(5.0_8*phi)) ! l = 6, m = -4 rn(3) = 0.00104990131391452_8 * (w2m1)**2 * & ((10395.0_8/TWO)*w**2 - 945.0_8/TWO) * sin(4.0_8*phi) ! l = 6, m = -3 - rn(4) = 0.00575054632785295_8 * (w2m1)**(THREE/TWO) * & - ((3465.0_8/TWO)*w**3 - 945.0_8/TWO*w) * sin(THREE*phi) + rn(4) = -(0.00575054632785295_8 * (w2m1)**(THREE/TWO) * & + ((3465.0_8/TWO)*w**3 - 945.0_8/TWO*w) * sin(THREE*phi)) ! l = 6, m = -2 rn(5) = 0.0345032779671177_8 * (w2m1) * & ((3465.0_8/8.0_8)*w**4 - 945.0_8/4.0_8 * w**2 + 105.0_8/8.0_8) & * sin(TWO*phi) ! l = 6, m = -1 - rn(6) = 0.218217890235992_8*sqrt(w2m1) * & + rn(6) = -(0.218217890235992_8*sqrt(w2m1) * & ((693.0_8/8.0_8)*w**5- 315.0_8/4.0_8 * w**3 + (105.0_8/8.0_8)*w) & - * sin(phi) + * sin(phi)) ! l = 6, m = 0 rn(7) = 14.4375_8 * w**6 - 19.6875_8 * w**4 + 6.5625_8 * w**2 - 0.3125_8 ! l = 6, m = 1 - rn(8) = 0.218217890235992_8*sqrt(w2m1) * & + rn(8) = -(0.218217890235992_8*sqrt(w2m1) * & ((693.0_8/8.0_8)*w**5- 315.0_8/4.0_8 * w**3 + (105.0_8/8.0_8)*w) & - * cos(phi) + * cos(phi)) ! l = 6, m = 2 rn(9) = 0.0345032779671177_8 * (w2m1) * & ((3465.0_8/8.0_8)*w**4 -945.0_8/4.0_8 * w**2 + 105.0_8/8.0_8) & * cos(TWO*phi) ! l = 6, m = 3 - rn(10) = 0.00575054632785295_8 * (w2m1)**(THREE/TWO) * & - ((3465.0_8/TWO)*w**3 - 945.0_8/TWO*w) * cos(THREE*phi) + rn(10) = -(0.00575054632785295_8 * (w2m1)**(THREE/TWO) * & + ((3465.0_8/TWO)*w**3 - 945.0_8/TWO*w) * cos(THREE*phi)) ! l = 6, m = 4 rn(11) = 0.00104990131391452_8 * (w2m1)**2 * & ((10395.0_8/TWO)*w**2 - 945.0_8/TWO) * cos(4.0_8*phi) ! l = 6, m = 5 - rn(12) = 2.32681380862329_8 * w*(w2m1)**(5.0_8/TWO) * cos(5.0_8*phi) + rn(12) = -(2.32681380862329_8 * w*(w2m1)**(5.0_8/TWO) * cos(5.0_8*phi)) ! l = 6, m = 6 rn(13) = 0.671693289381396_8 * (w2m1)**3 * cos(6.0_8*phi) case (7) ! l = 7, m = -7 - rn(1) = 0.647259849287749_8 * (w2m1)**(7.0_8/TWO) * sin(7.0_8*phi) + rn(1) = -(0.647259849287749_8 * (w2m1)**(7.0_8/TWO) * sin(7.0_8*phi)) ! l = 7, m = -6 rn(2) = 2.42182459624969_8 * w*(w2m1)**3 * sin(6.0_8*phi) ! l = 7, m = -5 - rn(3) = 9.13821798555235d-5*(w2m1)**(5.0_8/TWO)* & - ((135135.0_8/TWO)*w**2 - 10395.0_8/TWO) * sin(5.0_8*phi) + rn(3) = -(9.13821798555235d-5*(w2m1)**(5.0_8/TWO)* & + ((135135.0_8/TWO)*w**2 - 10395.0_8/TWO) * sin(5.0_8*phi)) ! l = 7, m = -4 rn(4) = 0.000548293079133141_8 * (w2m1)**2* & ((45045.0_8/TWO)*w**3 - 10395.0_8/TWO*w) * sin(4.0_8*phi) ! l = 7, m = -3 - rn(5) = 0.00363696483726654_8 * (w2m1)**(THREE/TWO)* & - ((45045.0_8/8.0_8)*w**4 - 10395.0_8/4.0_8 * w**2 + 945.0_8/8.0_8)* & - sin(THREE*phi) + rn(5) = -(0.00363696483726654_8 * (w2m1)**(THREE/TWO)* & + ((45045.0_8/8.0_8)*w**4 - 10395.0_8/4.0_8 * w**2 + 945.0_8/8.0_8)* & + sin(THREE*phi)) ! l = 7, m = -2 rn(6) = 0.025717224993682_8 * (w2m1)* & ((9009.0_8/8.0_8)*w**5 -3465.0_8/4.0_8 * w**3 + (945.0_8/8.0_8)*w)* & sin(TWO*phi) ! l = 7, m = -1 - rn(7) = 0.188982236504614_8*sqrt(w2m1)* & - ((3003.0_8/16.0_8)*w**6 - 3465.0_8/16.0_8 * w**4 + & - (945.0_8/16.0_8)*w**2 - 35.0_8/16.0_8) * sin(phi) + rn(7) = -(0.188982236504614_8*sqrt(w2m1)* & + ((3003.0_8/16.0_8)*w**6 - 3465.0_8/16.0_8 * w**4 + & + (945.0_8/16.0_8)*w**2 - 35.0_8/16.0_8) * sin(phi)) ! l = 7, m = 0 rn(8) = 26.8125_8 * w**7 - 43.3125_8 * w**5 + 19.6875_8 * w**3 -2.1875_8 & * w ! l = 7, m = 1 - rn(9) = 0.188982236504614_8*sqrt(w2m1)* & - ((3003.0_8/16.0_8)*w**6 - 3465.0_8/16.0_8 * w**4 + & - (945.0_8/16.0_8)*w**2 - 35.0_8/16.0_8) * cos(phi) + rn(9) = -(0.188982236504614_8*sqrt(w2m1)* & + ((3003.0_8/16.0_8)*w**6 - 3465.0_8/16.0_8 * w**4 + & + (945.0_8/16.0_8)*w**2 - 35.0_8/16.0_8) * cos(phi)) ! l = 7, m = 2 rn(10) = 0.025717224993682_8 * (w2m1)* & ((9009.0_8/8.0_8)*w**5 -3465.0_8/4.0_8 * w**3 + (945.0_8/8.0_8)*w)* & cos(TWO*phi) ! l = 7, m = 3 - rn(11) = 0.00363696483726654_8 * (w2m1)**(THREE/TWO)* & - ((45045.0_8/8.0_8)*w**4 - 10395.0_8/4.0_8 * w**2 + 945.0_8/8.0_8)* & - cos(THREE*phi) + rn(11) = -(0.00363696483726654_8 * (w2m1)**(THREE/TWO)* & + ((45045.0_8/8.0_8)*w**4 - 10395.0_8/4.0_8 * w**2 + 945.0_8/8.0_8)* & + cos(THREE*phi)) ! l = 7, m = 4 rn(12) = 0.000548293079133141_8 * (w2m1)**2 * & ((45045.0_8/TWO)*w**3 - 10395.0_8/TWO*w) * cos(4.0_8*phi) ! l = 7, m = 5 - rn(13) = 9.13821798555235d-5*(w2m1)**(5.0_8/TWO)* & - ((135135.0_8/TWO)*w**2 - 10395.0_8/TWO) * cos(5.0_8*phi) + rn(13) = -(9.13821798555235d-5*(w2m1)**(5.0_8/TWO)* & + ((135135.0_8/TWO)*w**2 - 10395.0_8/TWO) * cos(5.0_8*phi)) ! l = 7, m = 6 rn(14) = 2.42182459624969_8 * w*(w2m1)**3 * cos(6.0_8*phi) ! l = 7, m = 7 - rn(15) = 0.647259849287749_8 * (w2m1)**(7.0_8/TWO) * cos(7.0_8*phi) + rn(15) = -(0.647259849287749_8 * (w2m1)**(7.0_8/TWO) * cos(7.0_8*phi)) case (8) ! l = 8, m = -8 rn(1) = 0.626706654240044_8 * (w2m1)**4 * sin(8.0_8*phi) ! l = 8, m = -7 - rn(2) = 2.50682661696018_8 * w*(w2m1)**(7.0_8/TWO) * sin(7.0_8*phi) + rn(2) = -(2.50682661696018_8 * w*(w2m1)**(7.0_8/TWO) * sin(7.0_8*phi)) ! l = 8, m = -6 rn(3) = 6.77369783729086d-6*(w2m1)**3* & ((2027025.0_8/TWO)*w**2 - 135135.0_8/TWO) * sin(6.0_8*phi) ! l = 8, m = -5 - rn(4) = 4.38985792528482d-5*(w2m1)**(5.0_8/TWO)* & - ((675675.0_8/TWO)*w**3 - 135135.0_8/TWO*w) * sin(5.0_8*phi) + rn(4) = -(4.38985792528482d-5*(w2m1)**(5.0_8/TWO)* & + ((675675.0_8/TWO)*w**3 - 135135.0_8/TWO*w) * sin(5.0_8*phi)) ! l = 8, m = -4 rn(5) = 0.000316557156832328_8 * (w2m1)**2* & ((675675.0_8/8.0_8)*w**4 - 135135.0_8/4.0_8 * w**2 & + 10395.0_8/8.0_8) * sin(4.0_8*phi) ! l = 8, m = -3 - rn(6) = 0.00245204119306875_8 * (w2m1)**(THREE/TWO)* & - ((135135.0_8/8.0_8)*w**5 - 45045.0_8/4.0_8 * w**3 & - + (10395.0_8/8.0_8)*w) * sin(THREE*phi) + rn(6) = -(0.00245204119306875_8 * (w2m1)**(THREE/TWO)* & + ((135135.0_8/8.0_8)*w**5 - 45045.0_8/4.0_8 * w**3 & + + (10395.0_8/8.0_8)*w) * sin(THREE*phi)) ! l = 8, m = -2 rn(7) = 0.0199204768222399_8 * (w2m1)* & ((45045.0_8/16.0_8)*w**6- 45045.0_8/16.0_8 * w**4 + & (10395.0_8/16.0_8)*w**2 - 315.0_8/16.0_8) * sin(TWO*phi) ! l = 8, m = -1 - rn(8) = 0.166666666666667_8*sqrt(w2m1)* & - ((6435.0_8/16.0_8)*w**7 - 9009.0_8/16.0_8 * w**5 + & - (3465.0_8/16.0_8)*w**3 - 315.0_8/16.0_8 * w) * sin(phi) + rn(8) = -(0.166666666666667_8*sqrt(w2m1)* & + ((6435.0_8/16.0_8)*w**7 - 9009.0_8/16.0_8 * w**5 + & + (3465.0_8/16.0_8)*w**3 - 315.0_8/16.0_8 * w) * sin(phi)) ! l = 8, m = 0 rn(9) = 50.2734375_8 * w**8 - 93.84375_8 * w**6 + 54.140625_8 * w**4 -& 9.84375_8 * w**2 + 0.2734375_8 ! l = 8, m = 1 - rn(10) = 0.166666666666667_8*sqrt(w2m1)* & - ((6435.0_8/16.0_8)*w**7 - 9009.0_8/16.0_8 * w**5 + & - (3465.0_8/16.0_8)*w**3 - 315.0_8/16.0_8 * w) * cos(phi) + rn(10) = -(0.166666666666667_8*sqrt(w2m1)* & + ((6435.0_8/16.0_8)*w**7 - 9009.0_8/16.0_8 * w**5 + & + (3465.0_8/16.0_8)*w**3 - 315.0_8/16.0_8 * w) * cos(phi)) ! l = 8, m = 2 rn(11) = 0.0199204768222399_8 * (w2m1)*((45045.0_8/16.0_8)*w**6- & 45045.0_8/16.0_8 * w**4 + (10395.0_8/16.0_8)*w**2 - & 315.0_8/16.0_8) * cos(TWO*phi) ! l = 8, m = 3 - rn(12) = 0.00245204119306875_8 * (w2m1)**(THREE/TWO)* & - ((135135.0_8/8.0_8)*w**5 - 45045.0_8/4.0_8 * w**3 + & - (10395.0_8/8.0_8)*w) * cos(THREE*phi) + rn(12) = -(0.00245204119306875_8 * (w2m1)**(THREE/TWO)* & + ((135135.0_8/8.0_8)*w**5 - 45045.0_8/4.0_8 * w**3 + & + (10395.0_8/8.0_8)*w) * cos(THREE*phi)) ! l = 8, m = 4 rn(13) = 0.000316557156832328_8 * (w2m1)**2*((675675.0_8/8.0_8)*w**4 - & 135135.0_8/4.0_8 * w**2 + 10395.0_8/8.0_8) * cos(4.0_8*phi) ! l = 8, m = 5 - rn(14) = 4.38985792528482d-5*(w2m1)**(5.0_8/TWO)*((675675.0_8/TWO)*w**3 -& - 135135.0_8/TWO*w) * cos(5.0_8*phi) + rn(14) = -(4.38985792528482d-5*(w2m1)**(5.0_8/TWO)*((675675.0_8/TWO)*w**3 -& + 135135.0_8/TWO*w) * cos(5.0_8*phi)) ! l = 8, m = 6 rn(15) = 6.77369783729086d-6*(w2m1)**3*((2027025.0_8/TWO)*w**2 - & 135135.0_8/TWO) * cos(6.0_8*phi) ! l = 8, m = 7 - rn(16) = 2.50682661696018_8 * w*(w2m1)**(7.0_8/TWO) * cos(7.0_8*phi) + rn(16) = -(2.50682661696018_8 * w*(w2m1)**(7.0_8/TWO) * cos(7.0_8*phi)) ! l = 8, m = 8 rn(17) = 0.626706654240044_8 * (w2m1)**4 * cos(8.0_8*phi) case (9) ! l = 9, m = -9 - rn(1) = 0.609049392175524_8 * (w2m1)**(9.0_8/TWO) * sin(9.0_8*phi) + rn(1) = -(0.609049392175524_8 * (w2m1)**(9.0_8/TWO) * sin(9.0_8*phi)) ! l = 9, m = -8 rn(2) = 2.58397773170915_8 * w*(w2m1)**4 * sin(8.0_8*phi) ! l = 9, m = -7 - rn(3) = 4.37240315267812d-7*(w2m1)**(7.0_8/TWO)* & - ((34459425.0_8/TWO)*w**2 - 2027025.0_8/TWO) * sin(7.0_8*phi) + rn(3) = -(4.37240315267812d-7*(w2m1)**(7.0_8/TWO)* & + ((34459425.0_8/TWO)*w**2 - 2027025.0_8/TWO) * sin(7.0_8*phi)) ! l = 9, m = -6 rn(4) = 3.02928976464514d-6*(w2m1)**3* & ((11486475.0_8/TWO)*w**3 - 2027025.0_8/TWO*w) * sin(6.0_8*phi) ! l = 9, m = -5 - rn(5) = 2.34647776186144d-5*(w2m1)**(5.0_8/TWO)* & - ((11486475.0_8/8.0_8)*w**4 - 2027025.0_8/4.0_8 * w**2 + & - 135135.0_8/8.0_8) * sin(5.0_8*phi) + rn(5) = -(2.34647776186144d-5*(w2m1)**(5.0_8/TWO)* & + ((11486475.0_8/8.0_8)*w**4 - 2027025.0_8/4.0_8 * w**2 + & + 135135.0_8/8.0_8) * sin(5.0_8*phi)) ! l = 9, m = -4 rn(6) = 0.000196320414650061_8 * (w2m1)**2*((2297295.0_8/8.0_8)*w**5 - & 675675.0_8/4.0_8 * w**3 + (135135.0_8/8.0_8)*w) * sin(4.0_8*phi) ! l = 9, m = -3 - rn(7) = 0.00173385495536766_8 * (w2m1)**(THREE/TWO)* & - ((765765.0_8/16.0_8)*w**6 - 675675.0_8/16.0_8 * w**4 + & - (135135.0_8/16.0_8)*w**2 - 3465.0_8/16.0_8) * sin(THREE*phi) + rn(7) = -(0.00173385495536766_8 * (w2m1)**(THREE/TWO)* & + ((765765.0_8/16.0_8)*w**6 - 675675.0_8/16.0_8 * w**4 + & + (135135.0_8/16.0_8)*w**2 - 3465.0_8/16.0_8) * sin(THREE*phi)) ! l = 9, m = -2 rn(8) = 0.0158910431540932_8 * (w2m1)*((109395.0_8/16.0_8)*w**7- & 135135.0_8/16.0_8 * w**5 + (45045.0_8/16.0_8)*w**3 & - 3465.0_8/16.0_8 * w) * sin(TWO*phi) ! l = 9, m = -1 - rn(9) = 0.149071198499986_8*sqrt(w2m1)*((109395.0_8/128.0_8)*w**8 - & - 45045.0_8/32.0_8 * w**6 + (45045.0_8/64.0_8)*w**4 - 3465.0_8/32.0_8 & - * w**2 + 315.0_8/128.0_8) * sin(phi) + rn(9) = -(0.149071198499986_8*sqrt(w2m1)*((109395.0_8/128.0_8)*w**8 - & + 45045.0_8/32.0_8 * w**6 + (45045.0_8/64.0_8)*w**4 - 3465.0_8/32.0_8 & + * w**2 + 315.0_8/128.0_8) * sin(phi)) ! l = 9, m = 0 rn(10) = 94.9609375_8 * w**9 - 201.09375_8 * w**7 + 140.765625_8 * w**5- & 36.09375_8 * w**3 + 2.4609375_8 * w ! l = 9, m = 1 - rn(11) = 0.149071198499986_8*sqrt(w2m1)*((109395.0_8/128.0_8)*w**8 - & - 45045.0_8/32.0_8 * w**6 + (45045.0_8/64.0_8)*w**4 -3465.0_8/32.0_8 & - * w**2 + 315.0_8/128.0_8) * cos(phi) + rn(11) = -(0.149071198499986_8*sqrt(w2m1)*((109395.0_8/128.0_8)*w**8 - & + 45045.0_8/32.0_8 * w**6 + (45045.0_8/64.0_8)*w**4 -3465.0_8/32.0_8 & + * w**2 + 315.0_8/128.0_8) * cos(phi)) ! l = 9, m = 2 rn(12) = 0.0158910431540932_8 * (w2m1)*((109395.0_8/16.0_8)*w**7 - & 135135.0_8/16.0_8 * w**5 + (45045.0_8/16.0_8)*w**3 & - 3465.0_8/ 16.0_8 * w) * cos(TWO*phi) ! l = 9, m = 3 - rn(13) = 0.00173385495536766_8 * (w2m1)**(THREE/TWO)*((765765.0_8/16.0_8)& - *w**6 - 675675.0_8/16.0_8 * w**4 + (135135.0_8/16.0_8)*w**2 & - - 3465.0_8/16.0_8)* cos(THREE*phi) + rn(13) = -(0.00173385495536766_8 * (w2m1)**(THREE/TWO)*((765765.0_8/16.0_8)& + *w**6 - 675675.0_8/16.0_8 * w**4 + (135135.0_8/16.0_8)*w**2 & + - 3465.0_8/16.0_8)* cos(THREE*phi)) ! l = 9, m = 4 rn(14) = 0.000196320414650061_8 * (w2m1)**2*((2297295.0_8/8.0_8)*w**5 - & 675675.0_8/4.0_8 * w**3 + (135135.0_8/8.0_8)*w) * cos(4.0_8*phi) ! l = 9, m = 5 - rn(15) = 2.34647776186144d-5*(w2m1)**(5.0_8/TWO)*((11486475.0_8/8.0_8)* & - w**4 - 2027025.0_8/4.0_8 * w**2 + 135135.0_8/8.0_8) * cos(5.0_8*phi) + rn(15) = -(2.34647776186144d-5*(w2m1)**(5.0_8/TWO)*((11486475.0_8/8.0_8)* & + w**4 - 2027025.0_8/4.0_8 * w**2 + 135135.0_8/8.0_8) * cos(5.0_8*phi)) ! l = 9, m = 6 rn(16) = 3.02928976464514d-6*(w2m1)**3*((11486475.0_8/TWO)*w**3 - & 2027025.0_8/TWO*w) * cos(6.0_8*phi) ! l = 9, m = 7 - rn(17) = 4.37240315267812d-7*(w2m1)**(7.0_8/TWO)* & - ((34459425.0_8/TWO)*w**2 - 2027025.0_8/TWO) * cos(7.0_8*phi) + rn(17) = -(4.37240315267812d-7*(w2m1)**(7.0_8/TWO)* & + ((34459425.0_8/TWO)*w**2 - 2027025.0_8/TWO) * cos(7.0_8*phi)) ! l = 9, m = 8 rn(18) = 2.58397773170915_8 * w*(w2m1)**4 * cos(8.0_8*phi) ! l = 9, m = 9 - rn(19) = 0.609049392175524_8 * (w2m1)**(9.0_8/TWO) * cos(9.0_8*phi) + rn(19) = -(0.609049392175524_8 * (w2m1)**(9.0_8/TWO) * cos(9.0_8*phi)) case (10) ! l = 10, m = -10 rn(1) = 0.593627917136573_8 * (w2m1)**5 * sin(10.0_8*phi) ! l = 10, m = -9 - rn(2) = 2.65478475211798_8 * w*(w2m1)**(9.0_8/TWO) * sin(9.0_8*phi) + rn(2) = -(2.65478475211798_8 * w*(w2m1)**(9.0_8/TWO) * sin(9.0_8*phi)) ! l = 10, m = -8 rn(3) = 2.49953651452314d-8*(w2m1)**4*((654729075.0_8/TWO)*w**2 - & 34459425.0_8/TWO) * sin(8.0_8*phi) ! l = 10, m = -7 - rn(4) = 1.83677671621093d-7*(w2m1)**(7.0_8/TWO)* & - ((218243025.0_8/TWO)*w**3 - 34459425.0_8/TWO*w) * sin(7.0_8*phi) + rn(4) = -(1.83677671621093d-7*(w2m1)**(7.0_8/TWO)* & + ((218243025.0_8/TWO)*w**3 - 34459425.0_8/TWO*w) * sin(7.0_8*phi)) ! l = 10, m = -6 rn(5) = 1.51464488232257d-6*(w2m1)**3*((218243025.0_8/8.0_8)*w**4 - & 34459425.0_8/4.0_8 * w**2 + 2027025.0_8/8.0_8) * sin(6.0_8*phi) ! l = 10, m = -5 - rn(6) = 1.35473956745817d-5*(w2m1)**(5.0_8/TWO)* & - ((43648605.0_8/8.0_8)*w**5 - 11486475.0_8/4.0_8 * w**3 + & - (2027025.0_8/8.0_8)*w) * sin(5.0_8*phi) + rn(6) = -(1.35473956745817d-5*(w2m1)**(5.0_8/TWO)* & + ((43648605.0_8/8.0_8)*w**5 - 11486475.0_8/4.0_8 * w**3 + & + (2027025.0_8/8.0_8)*w) * sin(5.0_8*phi)) ! l = 10, m = -4 rn(7) = 0.000128521880085575_8 * (w2m1)**2*((14549535.0_8/16.0_8)*w**6 - & 11486475.0_8/16.0_8 * w**4 + (2027025.0_8/16.0_8)*w**2 - & 45045.0_8/16.0_8) * sin(4.0_8*phi) ! l = 10, m = -3 - rn(8) = 0.00127230170115096_8 * (w2m1)**(THREE/TWO)* & - ((2078505.0_8/16.0_8)*w**7 - 2297295.0_8/16.0_8 * w**5 + & - (675675.0_8/16.0_8)*w**3 - 45045.0_8/16.0_8 * w) * sin(THREE*phi) + rn(8) = -(0.00127230170115096_8 * (w2m1)**(THREE/TWO)* & + ((2078505.0_8/16.0_8)*w**7 - 2297295.0_8/16.0_8 * w**5 + & + (675675.0_8/16.0_8)*w**3 - 45045.0_8/16.0_8 * w) * sin(THREE*phi)) ! l = 10, m = -2 rn(9) = 0.012974982402692_8 * (w2m1)*((2078505.0_8/128.0_8)*w**8 - & 765765.0_8/32.0_8 * w**6 + (675675.0_8/64.0_8)*w**4 - & 45045.0_8/32.0_8 * w**2 + 3465.0_8/128.0_8) * sin(TWO*phi) ! l = 10, m = -1 - rn(10) = 0.134839972492648_8*sqrt(w2m1)*((230945.0_8/128.0_8)*w**9 - & - 109395.0_8/32.0_8 * w**7 + (135135.0_8/64.0_8)*w**5 - & - 15015.0_8/32.0_8 * w**3 + (3465.0_8/128.0_8)*w) * sin(phi) + rn(10) = -(0.134839972492648_8*sqrt(w2m1)*((230945.0_8/128.0_8)*w**9 - & + 109395.0_8/32.0_8 * w**7 + (135135.0_8/64.0_8)*w**5 - & + 15015.0_8/32.0_8 * w**3 + (3465.0_8/128.0_8)*w) * sin(phi)) ! l = 10, m = 0 rn(11) = 180.42578125_8 * w**10 - 427.32421875_8 * w**8 +351.9140625_8 & * w**6 - 117.3046875_8 * w**4 + 13.53515625_8 * w**2 -0.24609375_8 ! l = 10, m = 1 - rn(12) = 0.134839972492648_8*sqrt(w2m1)*((230945.0_8/128.0_8)*w**9 - & - 109395.0_8/32.0_8 * w**7 + (135135.0_8/64.0_8)*w**5 -15015.0_8/ & - 32.0_8 * w**3 + (3465.0_8/128.0_8)*w) * cos(phi) + rn(12) = -(0.134839972492648_8*sqrt(w2m1)*((230945.0_8/128.0_8)*w**9 - & + 109395.0_8/32.0_8 * w**7 + (135135.0_8/64.0_8)*w**5 -15015.0_8/ & + 32.0_8 * w**3 + (3465.0_8/128.0_8)*w) * cos(phi)) ! l = 10, m = 2 rn(13) = 0.012974982402692_8 * (w2m1)*((2078505.0_8/128.0_8)*w**8 - & 765765.0_8/32.0_8 * w**6 + (675675.0_8/64.0_8)*w**4 -& 45045.0_8/32.0_8 * w**2 + 3465.0_8/128.0_8) * cos(TWO*phi) ! l = 10, m = 3 - rn(14) = 0.00127230170115096_8 * (w2m1)**(THREE/TWO)* & - ((2078505.0_8/16.0_8)*w**7 - 2297295.0_8/16.0_8 * w**5 + & - (675675.0_8/16.0_8)*w**3 - 45045.0_8/16.0_8 * w) * cos(THREE*phi) + rn(14) = -(0.00127230170115096_8 * (w2m1)**(THREE/TWO)* & + ((2078505.0_8/16.0_8)*w**7 - 2297295.0_8/16.0_8 * w**5 + & + (675675.0_8/16.0_8)*w**3 - 45045.0_8/16.0_8 * w) * cos(THREE*phi)) ! l = 10, m = 4 rn(15) = 0.000128521880085575_8 * (w2m1)**2*((14549535.0_8/16.0_8)*w**6 -& 11486475.0_8/16.0_8 * w**4 + (2027025.0_8/16.0_8)*w**2 - & 45045.0_8/16.0_8) * cos(4.0_8*phi) ! l = 10, m = 5 - rn(16) = 1.35473956745817d-5*(w2m1)**(5.0_8/TWO)* & - ((43648605.0_8/8.0_8)*w**5 - 11486475.0_8/4.0_8 * w**3 + & - (2027025.0_8/8.0_8)*w) * cos(5.0_8*phi) + rn(16) = -(1.35473956745817d-5*(w2m1)**(5.0_8/TWO)* & + ((43648605.0_8/8.0_8)*w**5 - 11486475.0_8/4.0_8 * w**3 + & + (2027025.0_8/8.0_8)*w) * cos(5.0_8*phi)) ! l = 10, m = 6 rn(17) = 1.51464488232257d-6*(w2m1)**3*((218243025.0_8/8.0_8)*w**4 - & 34459425.0_8/4.0_8 * w**2 + 2027025.0_8/8.0_8) * cos(6.0_8*phi) ! l = 10, m = 7 - rn(18) = 1.83677671621093d-7*(w2m1)**(7.0_8/TWO)* & - ((218243025.0_8/TWO)*w**3 - 34459425.0_8/TWO*w) * cos(7.0_8*phi) + rn(18) = -(1.83677671621093d-7*(w2m1)**(7.0_8/TWO)* & + ((218243025.0_8/TWO)*w**3 - 34459425.0_8/TWO*w) * cos(7.0_8*phi)) ! l = 10, m = 8 rn(19) = 2.49953651452314d-8*(w2m1)**4* & ((654729075.0_8/TWO)*w**2 - 34459425.0_8/TWO) * cos(8.0_8*phi) ! l = 10, m = 9 - rn(20) = 2.65478475211798_8 * w*(w2m1)**(9.0_8/TWO) * cos(9.0_8*phi) + rn(20) = -(2.65478475211798_8 * w*(w2m1)**(9.0_8/TWO) * cos(9.0_8*phi)) ! l = 10, m = 10 rn(21) = 0.593627917136573_8 * (w2m1)**5 * cos(10.0_8*phi) case default diff --git a/src/output.F90 b/src/output.F90 index 3770af7c69..3463244e31 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -950,16 +950,19 @@ contains if (n_tallies == 0) return ! Initialize names for tally filter types - filter_name(FILTER_UNIVERSE) = "Universe" - filter_name(FILTER_MATERIAL) = "Material" - filter_name(FILTER_DISTRIBCELL) = "Distributed Cell" - filter_name(FILTER_CELL) = "Cell" - filter_name(FILTER_CELLBORN) = "Birth Cell" - filter_name(FILTER_SURFACE) = "Surface" - filter_name(FILTER_MESH) = "Mesh" - filter_name(FILTER_ENERGYIN) = "Incoming Energy" - filter_name(FILTER_ENERGYOUT) = "Outgoing Energy" - filter_name(FILTER_DELAYEDGROUP) = "Delayed Group" + filter_name(FILTER_UNIVERSE) = "Universe" + filter_name(FILTER_MATERIAL) = "Material" + filter_name(FILTER_DISTRIBCELL) = "Distributed Cell" + filter_name(FILTER_CELL) = "Cell" + filter_name(FILTER_CELLBORN) = "Birth Cell" + filter_name(FILTER_SURFACE) = "Surface" + filter_name(FILTER_MESH) = "Mesh" + filter_name(FILTER_ENERGYIN) = "Incoming Energy" + filter_name(FILTER_ENERGYOUT) = "Outgoing Energy" + filter_name(FILTER_MU) = "Change-in-Angle" + filter_name(FILTER_POLAR) = "Polar Angle" + filter_name(FILTER_AZIMUTHAL) = "Azimuthal Angle" + filter_name(FILTER_DELAYEDGROUP) = "Delayed Group" ! Initialize names for scores score_names(abs(SCORE_FLUX)) = "Flux" @@ -1398,7 +1401,8 @@ contains label = "Index (" // trim(to_str(ijk(1))) // ", " // & trim(to_str(ijk(2))) // ", " // trim(to_str(ijk(3))) // ")" end if - case (FILTER_ENERGYIN, FILTER_ENERGYOUT) + case (FILTER_ENERGYIN, FILTER_ENERGYOUT, FILTER_MU, FILTER_POLAR, & + FILTER_AZIMUTHAL) E0 = t % filters(i_filter) % real_bins(bin) E1 = t % filters(i_filter) % real_bins(bin + 1) label = "[" // trim(to_str(E0)) // ", " // trim(to_str(E1)) // ")" diff --git a/src/physics.F90 b/src/physics.F90 index 5e9675b175..3bf0a43661 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -465,6 +465,12 @@ contains ! Set energy and direction of particle in LAB frame uvw = v_n / vel + ! Because of floating-point roundoff, it may be possible for mu_lab to be + ! outside of the range [-1,1). In these cases, we just set mu_lab to exactly + ! -1 or 1 + + if (abs(mu_lab) > ONE) mu_lab = sign(ONE,mu_lab) + end subroutine elastic_scatter !=============================================================================== @@ -711,6 +717,12 @@ contains end if ! (inelastic secondary energy treatment) end if ! (elastic or inelastic) + ! Because of floating-point roundoff, it may be possible for mu to be + ! outside of the range [-1,1). In these cases, we just set mu to exactly + ! -1 or 1 + + if (abs(mu) > ONE) mu = sign(ONE,mu) + ! change direction of particle uvw = rotate_angle(uvw, mu) @@ -1320,6 +1332,11 @@ contains ! sample outgoing energy if (law == 44 .or. law == 61) then call sample_energy(rxn%edist, E_in, E, mu) + ! Because of floating-point roundoff, it may be possible for mu to be + ! outside of the range [-1,1). In these cases, we just set mu to exactly + ! -1 or 1 + + if (abs(mu) > ONE) mu = sign(ONE,mu) elseif (law == 66) then call sample_energy(rxn%edist, E_in, E, A=A, Q=Q) else @@ -1337,6 +1354,12 @@ contains ! determine outgoing angle in lab mu = mu * sqrt(E_cm/E) + ONE/(A+ONE) * sqrt(E_in/E) + + ! Because of floating-point roundoff, it may be possible for mu to be + ! outside of the range [-1,1). In these cases, we just set mu to exactly + ! -1 or 1 + + if (abs(mu) > ONE) mu = sign(ONE,mu) end if ! Set outgoing energy and scattering angle diff --git a/src/relaxng/tallies.rnc b/src/relaxng/tallies.rnc index 155f379d88..75afb0f231 100644 --- a/src/relaxng/tallies.rnc +++ b/src/relaxng/tallies.rnc @@ -23,11 +23,11 @@ element tallies { attribute estimator { ( "analog" | "tracklength" ) })? & element filter { (element type { ( "cell" | "cellborn" | "material" | "universe" | - "surface" | "distribcell" | "mesh" | "energy" | "energyout" | - "delayedgroup" ) } | + "surface" | "distribcell" | "mesh" | "energy" | "energyout" | "mu" | + "polar" | "azimuthal" | "delayedgroup") } | attribute type { ( "cell" | "cellborn" | "material" | "universe" | - "surface" | "distribcell" | "mesh" | "energy" | "energyout" | - "delayedgroup" ) }) & + "surface" | "distribcell" | "mesh" | "energy" | "energyout" | "mu" | + "polar" | "azimuthal" | "delayedgroup") }) & (element bins { list { xsd:double+ } } | attribute bins { list { xsd:double+ } }) }* & diff --git a/src/relaxng/tallies.rng b/src/relaxng/tallies.rng index d2cd9271ee..d35c170042 100644 --- a/src/relaxng/tallies.rng +++ b/src/relaxng/tallies.rng @@ -146,6 +146,9 @@ energy energyout delayedgroup + mu + polar + azimuthal @@ -160,6 +163,9 @@ energy energyout delayedgroup + mu + polar + azimuthal diff --git a/src/state_point.F90 b/src/state_point.F90 index d5267c4160..6d1c6f3129 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -256,6 +256,12 @@ contains call write_dataset(filter_group, "type", "energy") case(FILTER_ENERGYOUT) call write_dataset(filter_group, "type", "energyout") + case(FILTER_MU) + call write_dataset(filter_group, "type", "mu") + case(FILTER_POLAR) + call write_dataset(filter_group, "type", "polar") + case(FILTER_AZIMUTHAL) + call write_dataset(filter_group, "type", "azimuthal") case(FILTER_DISTRIBCELL) call write_dataset(filter_group, "type", "distribcell") case(FILTER_DELAYEDGROUP) @@ -264,8 +270,11 @@ contains call write_dataset(filter_group, "offset", tally%filters(j)%offset) call write_dataset(filter_group, "n_bins", tally%filters(j)%n_bins) - if (tally%filters(j)%type == FILTER_ENERGYIN .or. & - tally%filters(j)%type == FILTER_ENERGYOUT) then + if (tally % filters(j) % type == FILTER_ENERGYIN .or. & + tally % filters(j) % type == FILTER_ENERGYOUT .or. & + tally % filters(j) % type == FILTER_MU .or. & + tally % filters(j) % type == FILTER_POLAR .or. & + tally % filters(j) % type == FILTER_AZIMUTHAL) then call write_dataset(filter_group, "bins", & tally%filters(j)%real_bins) else diff --git a/src/summary.F90 b/src/summary.F90 index d9c10e12ce..f3edbe7199 100644 --- a/src/summary.F90 +++ b/src/summary.F90 @@ -540,7 +540,10 @@ contains ! Write filter bins if (t%filters(j)%type == FILTER_ENERGYIN .or. & - t%filters(j)%type == FILTER_ENERGYOUT) then + t%filters(j)%type == FILTER_ENERGYOUT .or. & + t%filters(j)%type == FILTER_MU .or. & + t%filters(j)%type == FILTER_POLAR .or. & + t%filters(j)%type == FILTER_AZIMUTHAL) then call write_dataset(filter_group, "bins", t%filters(j)%real_bins) else call write_dataset(filter_group, "bins", t%filters(j)%int_bins) @@ -566,6 +569,12 @@ contains call write_dataset(filter_group, "type", "energyout") case(FILTER_DISTRIBCELL) call write_dataset(filter_group, "type", "distribcell") + case(FILTER_MU) + call write_dataset(filter_group, "type", "mu") + case(FILTER_POLAR) + call write_dataset(filter_group, "type", "polar") + case(FILTER_AZIMUTHAL) + call write_dataset(filter_group, "type", "azimuthal") end select call close_group(filter_group) diff --git a/src/tally.F90 b/src/tally.F90 index d93b721bfc..69ccd07d2a 100644 --- a/src/tally.F90 +++ b/src/tally.F90 @@ -1265,6 +1265,8 @@ contains logical :: found_bin ! was a scoring bin found? logical :: start_in_mesh ! starting coordinates inside mesh? logical :: end_in_mesh ! ending coordinates inside mesh? + real(8) :: theta + real(8) :: phi type(TallyObject), pointer :: t type(RegularMesh), pointer :: m type(Material), pointer :: mat @@ -1350,6 +1352,40 @@ contains k + 1, p % E) end if + case (FILTER_POLAR) + ! Get theta value + theta = acos(p % coord(1) % uvw(3)) + + ! determine polar angle bin + k = t % filters(i) % n_bins + + ! check if particle is within polar angle bins + if (theta < t % filters(i) % real_bins(1) .or. & + theta > t % filters(i) % real_bins(k + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find polar angle bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + k + 1, theta) + end if + + case (FILTER_AZIMUTHAL) + ! make sure the correct direction vector is used + phi = atan2(p % coord(1) % uvw(2), p % coord(1) % uvw(1)) + + ! determine mu bin + k = t % filters(i) % n_bins + + ! check if particle is within azimuthal angle bins + if (phi < t % filters(i) % real_bins(1) .or. & + phi > t % filters(i) % real_bins(k + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find azimuthal angle bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + k + 1, phi) + end if + end select ! Check if no matching bin was found @@ -1606,6 +1642,7 @@ contains integer :: n ! number of bins for single filter integer :: offset ! offset for distribcell real(8) :: E ! particle energy + real(8) :: theta, phi ! Polar and Azimuthal Angles, respectively type(TallyObject), pointer :: t type(RegularMesh), pointer :: m @@ -1729,6 +1766,62 @@ contains matching_bins(i) = p % delayed_group end if end if + + case (FILTER_MU) + ! determine mu bin + n = t % filters(i) % n_bins + + ! check if particle is within mu bins + if (p % mu < t % filters(i) % real_bins(1) .or. & + p % mu > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find mu bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, p % mu) + end if + + case (FILTER_POLAR) + ! make sure the correct direction vector is used + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + theta = acos(p % coord(1) % uvw(3)) + else + theta = acos(p % last_uvw(3)) + end if + + ! determine polar angle bin + n = t % filters(i) % n_bins + + ! check if particle is within polar angle bins + if (theta < t % filters(i) % real_bins(1) .or. & + theta > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find polar angle bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, theta) + end if + + case (FILTER_AZIMUTHAL) + ! make sure the correct direction vector is used + if (t % estimator == ESTIMATOR_TRACKLENGTH) then + phi = atan2(p % coord(1) % uvw(2), p % coord(1) % uvw(1)) + else + phi = atan2(p % last_uvw(2), p % last_uvw(1)) + end if + ! determine mu bin + n = t % filters(i) % n_bins + + ! check if particle is within azimuthal angle bins + if (phi < t % filters(i) % real_bins(1) .or. & + phi > t % filters(i) % real_bins(n + 1)) then + matching_bins(i) = NO_BIN_FOUND + else + ! search to find azimuthal angle bin + matching_bins(i) = binary_search(t % filters(i) % real_bins, & + n + 1, phi) + end if + end select ! If the current filter didn't match, exit this subroutine diff --git a/tests/test_filter_azimuthal/inputs_true.dat b/tests/test_filter_azimuthal/inputs_true.dat new file mode 100644 index 0000000000..42b6e820be --- /dev/null +++ b/tests/test_filter_azimuthal/inputs_true.dat @@ -0,0 +1 @@ +1d5f81d12f607f4a8436dfb65167e2a2be55dbf86fbc2cc465cec274671be5eaff517d781a4d40e264bb695e3c66c7ff61a650217c99de2ca8c15ca747fe6b80 \ No newline at end of file diff --git a/tests/test_filter_azimuthal/results_true.dat b/tests/test_filter_azimuthal/results_true.dat new file mode 100644 index 0000000000..7883a730d4 --- /dev/null +++ b/tests/test_filter_azimuthal/results_true.dat @@ -0,0 +1,76 @@ +k-combined: +9.903196E-01 4.279617E-02 +tally 1: +4.215917E+01 +3.561920E+02 +4.174788E+01 +3.505184E+02 +4.603223E+01 +4.242918E+02 +4.496760E+01 +4.075599E+02 +4.088099E+01 +3.376516E+02 +tally 2: +4.157239E+01 +3.482158E+02 +4.227810E+01 +3.613293E+02 +4.376107E+01 +3.835007E+02 +4.644205E+01 +4.327195E+02 +4.191554E+01 +3.522147E+02 +tally 3: +4.215917E+01 +3.561920E+02 +4.174788E+01 +3.505184E+02 +4.603223E+01 +4.242918E+02 +4.496402E+01 +4.075053E+02 +4.088458E+01 +3.377000E+02 +tally 4: +1.531988E+01 +4.816326E+01 +9.274393E+00 +1.821174E+01 +1.595868E+01 +5.124238E+01 +1.299895E+00 +6.417145E-01 +1.510024E+01 +4.604170E+01 +8.533361E+00 +1.462765E+01 +1.658141E+01 +5.595629E+01 +1.427417E+00 +6.621807E-01 +1.683102E+01 +5.741400E+01 +9.845257E+00 +2.028406E+01 +1.773179E+01 +6.477077E+01 +1.536972E+00 +6.111079E-01 +1.586070E+01 +5.360975E+01 +9.928220E+00 +2.089005E+01 +1.737609E+01 +6.161847E+01 +1.700608E+00 +8.439708E-01 +1.607027E+01 +5.490113E+01 +7.569336E+00 +1.280955E+01 +1.606086E+01 +5.308665E+01 +9.898901E-01 +3.143027E-01 diff --git a/tests/test_filter_azimuthal/test_filter_azimuthal.py b/tests/test_filter_azimuthal/test_filter_azimuthal.py new file mode 100644 index 0000000000..248ba00120 --- /dev/null +++ b/tests/test_filter_azimuthal/test_filter_azimuthal.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +import openmc + +class FilterAzimuthalTestHarness(PyAPITestHarness): + def _build_inputs(self): + filt1 = openmc.Filter(type='azimuthal', + bins=(-3.1416, -1.8850, -0.6283, 0.6283, 1.8850, + 3.1416)) + tally1 = openmc.Tally(tally_id=1) + tally1.add_filter(filt1) + tally1.add_score('flux') + tally1.estimator = 'tracklength' + + tally2 = openmc.Tally(tally_id=2) + tally2.add_filter(filt1) + tally2.add_score('flux') + tally2.estimator = 'analog' + + filt3 = openmc.Filter(type='azimuthal', bins=(5,)) + tally3 = openmc.Tally(tally_id=3) + tally3.add_filter(filt3) + tally3.add_score('flux') + tally3.estimator = 'tracklength' + + mesh = openmc.Mesh(mesh_id=1) + mesh.lower_left = [-182.07, -182.07] + mesh.upper_right = [182.07, 182.07] + mesh.dimension = [2, 2] + filt_mesh = openmc.Filter(type='mesh', bins=(1,)) + tally4 = openmc.Tally(tally_id=4) + tally4.add_filter(filt3) + tally4.add_filter(filt_mesh) + tally4.add_score('flux') + tally4.estimator = 'tracklength' + + + self._input_set.tallies = openmc.TalliesFile() + self._input_set.tallies.add_tally(tally1) + self._input_set.tallies.add_tally(tally2) + self._input_set.tallies.add_tally(tally3) + self._input_set.tallies.add_tally(tally4) + self._input_set.tallies.add_mesh(mesh) + + super(FilterAzimuthalTestHarness, self)._build_inputs() + + def _cleanup(self): + super(FilterAzimuthalTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + + +if __name__ == '__main__': + harness = FilterAzimuthalTestHarness('statepoint.10.*', True) + harness.main() diff --git a/tests/test_filter_mu/inputs_true.dat b/tests/test_filter_mu/inputs_true.dat new file mode 100644 index 0000000000..b0a607ad34 --- /dev/null +++ b/tests/test_filter_mu/inputs_true.dat @@ -0,0 +1 @@ +cd2aeb24baafe9a904e697955990f6cffb5f25618fdf8c972775715bfe6e92bc259e36fd2b5addff8181439de58ad6f530972ec391e827f46146a2aaace34358 \ No newline at end of file diff --git a/tests/test_filter_mu/results_true.dat b/tests/test_filter_mu/results_true.dat new file mode 100644 index 0000000000..e647a46ec0 --- /dev/null +++ b/tests/test_filter_mu/results_true.dat @@ -0,0 +1,121 @@ +k-combined: +9.903196E-01 4.279617E-02 +tally 1: +1.241000E+01 +3.088870E+01 +1.241000E+01 +3.088870E+01 +1.364000E+01 +3.727140E+01 +1.364000E+01 +3.727140E+01 +3.251000E+01 +2.118597E+02 +3.251000E+01 +2.118597E+02 +7.297000E+01 +1.066904E+03 +7.297000E+01 +1.066904E+03 +tally 2: +9.880000E+00 +1.964520E+01 +9.880000E+00 +1.964520E+01 +1.022000E+01 +2.099620E+01 +1.022000E+01 +2.099620E+01 +1.479000E+01 +4.397670E+01 +1.479000E+01 +4.397670E+01 +3.470000E+01 +2.412094E+02 +3.470000E+01 +2.412094E+02 +6.194000E+01 +7.687326E+02 +6.194000E+01 +7.687326E+02 +tally 3: +3.560000E+00 +2.681800E+00 +3.560000E+00 +2.681800E+00 +1.930000E+00 +7.915000E-01 +1.930000E+00 +7.915000E-01 +3.870000E+00 +3.109100E+00 +3.870000E+00 +3.109100E+00 +3.500000E-01 +3.630000E-02 +3.500000E-01 +3.630000E-02 +3.680000E+00 +2.840200E+00 +3.680000E+00 +2.840200E+00 +2.050000E+00 +8.735000E-01 +2.050000E+00 +8.735000E-01 +3.910000E+00 +3.085100E+00 +3.910000E+00 +3.085100E+00 +3.900000E-01 +3.610000E-02 +3.900000E-01 +3.610000E-02 +5.130000E+00 +5.422100E+00 +5.130000E+00 +5.422100E+00 +3.100000E+00 +1.959200E+00 +3.100000E+00 +1.959200E+00 +5.840000E+00 +6.914600E+00 +5.840000E+00 +6.914600E+00 +5.400000E-01 +8.980000E-02 +5.400000E-01 +8.980000E-02 +1.215000E+01 +3.061010E+01 +1.215000E+01 +3.061010E+01 +7.220000E+00 +1.081680E+01 +7.220000E+00 +1.081680E+01 +1.355000E+01 +3.699090E+01 +1.355000E+01 +3.699090E+01 +1.360000E+00 +5.098000E-01 +1.360000E+00 +5.098000E-01 +2.199000E+01 +9.837430E+01 +2.199000E+01 +9.837430E+01 +1.243000E+01 +3.167470E+01 +1.243000E+01 +3.167470E+01 +2.451000E+01 +1.233915E+02 +2.451000E+01 +1.233915E+02 +2.460000E+00 +1.687000E+00 +2.460000E+00 +1.687000E+00 diff --git a/tests/test_filter_mu/test_filter_mu.py b/tests/test_filter_mu/test_filter_mu.py new file mode 100644 index 0000000000..f59f8c63fd --- /dev/null +++ b/tests/test_filter_mu/test_filter_mu.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +import openmc + + +class FilterMuTestHarness(PyAPITestHarness): + def _build_inputs(self): + filt1 = openmc.Filter(type='mu', + bins=(-1.0, -0.5, 0.0, 0.5, 1.0)) + tally1 = openmc.Tally(tally_id=1) + tally1.add_filter(filt1) + tally1.add_score('scatter') + tally1.add_score('nu-scatter') + + filt2 = openmc.Filter(type='mu', bins=(5,)) + tally2 = openmc.Tally(tally_id=2) + tally2.add_filter(filt2) + tally2.add_score('scatter') + tally2.add_score('nu-scatter') + + mesh = openmc.Mesh(mesh_id=1) + mesh.lower_left = [-182.07, -182.07] + mesh.upper_right = [182.07, 182.07] + mesh.dimension = [2, 2] + filt_mesh = openmc.Filter(type='mesh', bins=(1,)) + tally3 = openmc.Tally(tally_id=3) + tally3.add_filter(filt2) + tally3.add_filter(filt_mesh) + tally3.add_score('scatter') + tally3.add_score('nu-scatter') + + + self._input_set.tallies = openmc.TalliesFile() + self._input_set.tallies.add_tally(tally1) + self._input_set.tallies.add_tally(tally2) + self._input_set.tallies.add_tally(tally3) + self._input_set.tallies.add_mesh(mesh) + + super(FilterMuTestHarness, self)._build_inputs() + + def _cleanup(self): + super(FilterMuTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + + +if __name__ == '__main__': + harness = FilterMuTestHarness('statepoint.10.*', True) + harness.main() diff --git a/tests/test_filter_polar/inputs_true.dat b/tests/test_filter_polar/inputs_true.dat new file mode 100644 index 0000000000..db67a890f1 --- /dev/null +++ b/tests/test_filter_polar/inputs_true.dat @@ -0,0 +1 @@ +2de29e0a083af0722039ebc246469f26e260d604ab8b76314b2ac472bbd23004e031aec7afe3dbfc4c6112428846cd0cf0c1430e878832b9dab36463d026dee6 \ No newline at end of file diff --git a/tests/test_filter_polar/results_true.dat b/tests/test_filter_polar/results_true.dat new file mode 100644 index 0000000000..2d822630e5 --- /dev/null +++ b/tests/test_filter_polar/results_true.dat @@ -0,0 +1,76 @@ +k-combined: +9.903196E-01 4.279617E-02 +tally 1: +2.127061E+01 +9.220793E+01 +5.602776E+01 +6.373945E+02 +6.367492E+01 +8.138443E+02 +5.529942E+01 +6.140264E+02 +1.951517E+01 +7.668661E+01 +tally 2: +2.075936E+01 +8.757254E+01 +5.524881E+01 +6.153139E+02 +6.475252E+01 +8.402281E+02 +5.446664E+01 +5.961174E+02 +2.074180E+01 +8.681580E+01 +tally 3: +2.128073E+01 +9.230382E+01 +5.601764E+01 +6.371703E+02 +6.367492E+01 +8.138443E+02 +5.529942E+01 +6.140264E+02 +1.951517E+01 +7.668661E+01 +tally 4: +8.088647E+00 +1.396899E+01 +3.960907E+00 +3.249150E+00 +8.430714E+00 +1.435355E+01 +7.192159E-01 +1.641710E-01 +1.974619E+01 +8.105078E+01 +1.212452E+01 +3.016420E+01 +2.228348E+01 +1.050847E+02 +1.748809E+00 +9.501796E-01 +2.257423E+01 +1.038902E+02 +1.351331E+01 +3.969787E+01 +2.507638E+01 +1.283664E+02 +2.193118E+00 +1.424580E+00 +2.192232E+01 +9.859711E+01 +1.096779E+01 +2.506373E+01 +2.074138E+01 +8.670015E+01 +1.469145E+00 +8.072204E-01 +6.850719E+00 +9.425536E+00 +4.584038E+00 +4.399762E+00 +7.176883E+00 +1.090693E+01 +8.244944E-01 +1.794291E-01 diff --git a/tests/test_filter_polar/test_filter_polar.py b/tests/test_filter_polar/test_filter_polar.py new file mode 100644 index 0000000000..db7ed4f6d8 --- /dev/null +++ b/tests/test_filter_polar/test_filter_polar.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +import os +import sys +sys.path.insert(0, os.pardir) +from testing_harness import TestHarness, PyAPITestHarness +import openmc + +class FilterPolarTestHarness(PyAPITestHarness): + def _build_inputs(self): + filt1 = openmc.Filter(type='polar', + bins=(0.0, 0.6283, 1.2566, 1.8850, 2.5132, + 3.1416)) + tally1 = openmc.Tally(tally_id=1) + tally1.add_filter(filt1) + tally1.add_score('flux') + tally1.estimator = 'tracklength' + + tally2 = openmc.Tally(tally_id=2) + tally2.add_filter(filt1) + tally2.add_score('flux') + tally2.estimator = 'analog' + + filt3 = openmc.Filter(type='polar', bins=(5,)) + tally3 = openmc.Tally(tally_id=3) + tally3.add_filter(filt3) + tally3.add_score('flux') + tally3.estimator = 'tracklength' + + mesh = openmc.Mesh(mesh_id=1) + mesh.lower_left = [-182.07, -182.07] + mesh.upper_right = [182.07, 182.07] + mesh.dimension = [2, 2] + filt_mesh = openmc.Filter(type='mesh', bins=(1,)) + tally4 = openmc.Tally(tally_id=4) + tally4.add_filter(filt3) + tally4.add_filter(filt_mesh) + tally4.add_score('flux') + tally4.estimator = 'tracklength' + + + self._input_set.tallies = openmc.TalliesFile() + self._input_set.tallies.add_tally(tally1) + self._input_set.tallies.add_tally(tally2) + self._input_set.tallies.add_tally(tally3) + self._input_set.tallies.add_tally(tally4) + self._input_set.tallies.add_mesh(mesh) + + super(FilterPolarTestHarness, self)._build_inputs() + + def _cleanup(self): + super(FilterPolarTestHarness, self)._cleanup() + f = os.path.join(os.getcwd(), 'tallies.xml') + if os.path.exists(f): os.remove(f) + + +if __name__ == '__main__': + harness = FilterPolarTestHarness('statepoint.10.*', True) + harness.main() diff --git a/tests/test_many_scores/results_true.dat b/tests/test_many_scores/results_true.dat index 6209bd6a2d..9309d0964f 100644 --- a/tests/test_many_scores/results_true.dat +++ b/tests/test_many_scores/results_true.dat @@ -37,73 +37,73 @@ tally 1: 5.986137E+03 2.247257E+01 1.683779E+02 --1.512960E-01 +1.512960E-01 2.623972E-02 -3.775020E-01 1.055377E-01 --1.916133E-01 +1.916133E-01 4.680798E-02 2.754367E-02 3.320008E-04 --2.028374E-02 +2.028374E-02 1.319357E-02 8.974271E-03 1.681081E-03 --1.658978E-01 +1.658978E-01 1.520448E-02 2.878360E-01 5.645480E-02 1.014000E+01 3.427342E+01 --4.798897E-02 +4.798897E-02 1.551226E-03 -1.818770E-01 1.492633E-02 --6.340651E-02 +6.340651E-02 9.011305E-03 3.395308E-02 4.612818E-04 --2.640250E-02 +2.640250E-02 6.434787E-04 -8.242639E-03 9.516540E-04 --8.378601E-02 +8.378601E-02 2.645988E-03 9.567484E-02 7.262477E-03 8.628000E+00 2.481430E+01 --4.712248E-02 +4.712248E-02 1.140942E-03 -6.431930E-02 4.290580E-03 --9.251642E-02 +9.251642E-02 8.134201E-03 1.020119E-04 1.154184E-04 --2.994164E-02 +2.994164E-02 3.079076E-04 2.128844E-02 2.046549E-04 -1.637972E-02 +-1.637972E-02 1.459209E-04 4.629047E-02 7.823267E-04 8.632000E+00 2.483728E+01 --4.651997E-02 +4.651997E-02 1.133839E-03 -6.416955E-02 4.279418E-03 --9.280565E-02 +9.280565E-02 8.095106E-03 -2.078094E-04 1.151292E-04 --3.005568E-02 +3.005568E-02 3.104764E-04 2.199519E-02 2.179172E-04 -1.660645E-02 +-1.660645E-02 1.451345E-04 4.607553E-02 7.673412E-04 diff --git a/tests/test_score_flux_yn/results_true.dat b/tests/test_score_flux_yn/results_true.dat index fecff843d9..28a1babb04 100644 --- a/tests/test_score_flux_yn/results_true.dat +++ b/tests/test_score_flux_yn/results_true.dat @@ -16,1299 +16,1299 @@ tally 1: tally 2: 3.890713E+01 3.046363E+02 -1.623579E-01 +-1.623579E-01 4.602199E-02 4.860074E-01 5.999399E-01 -7.895692E-01 +-7.895692E-01 2.803790E-01 2.525526E-01 8.261176E-02 --9.103525E-02 +9.103525E-02 2.246700E-01 4.583205E-01 8.444556E-02 -1.246553E-01 +-1.246553E-01 2.351010E-01 -3.534581E-01 1.247916E-01 -3.700473E-01 +-3.700473E-01 5.215562E-02 -1.831625E-01 1.927381E-01 -1.540114E-01 +-1.540114E-01 1.918221E-02 -1.266458E-01 1.455875E-01 -6.796869E-01 +-6.796869E-01 3.911926E-01 1.987931E-02 4.966442E-02 --4.443797E-01 +4.443797E-01 8.842717E-02 -1.073855E-01 4.912428E-02 -3.999416E-02 +-3.999416E-02 4.440138E-02 2.857919E-01 6.935717E-02 --4.174851E-01 +4.174851E-01 5.485570E-02 -2.178958E-01 8.052149E-02 -1.179644E-02 +-1.179644E-02 6.709330E-02 8.843286E-01 2.749681E-01 --2.935079E-01 +2.935079E-01 3.032897E-02 -1.809434E-01 1.902413E-01 -2.091991E-01 +-2.091991E-01 1.061912E-01 -7.137275E-02 4.397656E-02 --2.311558E-01 +2.311558E-01 4.680679E-02 9.927573E-02 1.844111E-01 -2.821437E-02 +-2.821437E-02 7.293762E-02 6.224251E-01 1.028351E-01 --4.136440E-01 +4.136440E-01 5.198207E-02 -7.833133E-02 1.192960E-02 --1.041586E-01 +1.041586E-01 1.587417E-01 -3.595677E-01 3.086335E-01 -2.096284E-01 +-2.096284E-01 7.881012E-02 1.366220E+01 3.758161E+01 --1.461402E-02 +1.461402E-02 3.260482E-03 8.325893E-02 6.248769E-02 -2.785736E-01 +-2.785736E-01 3.698417E-02 1.932396E-03 1.561742E-02 --8.063397E-02 +8.063397E-02 3.598680E-02 8.565555E-02 5.344369E-03 -3.899905E-02 +-3.899905E-02 2.422867E-02 -1.215439E-01 9.193858E-03 -1.982614E-01 +-1.982614E-01 1.045860E-02 -7.712629E-02 2.199979E-02 --3.626484E-02 +3.626484E-02 9.872078E-04 -6.305159E-02 1.645879E-02 -3.052155E-01 +-3.052155E-01 5.620564E-02 3.507115E-02 1.056383E-02 --1.297490E-02 +1.297490E-02 5.889958E-03 -1.208752E-02 7.323602E-03 -3.441007E-03 +-3.441007E-03 1.841496E-02 5.543442E-02 1.186636E-02 --8.000436E-02 +8.000436E-02 3.703835E-03 -3.636792E-02 1.490603E-02 --8.753196E-02 +8.753196E-02 7.958027E-03 2.066727E-01 1.414130E-02 --3.652482E-02 +3.652482E-02 8.380395E-04 -1.652432E-01 1.878732E-02 -1.375567E-01 +-1.375567E-01 1.302400E-02 3.692057E-03 6.312506E-03 --9.016211E-02 +9.016211E-02 6.699735E-03 -5.875401E-02 1.731945E-02 -3.960008E-02 +-3.960008E-02 3.595906E-03 1.653510E-01 9.277293E-03 --4.064973E-02 +4.064973E-02 2.794606E-03 -1.729061E-02 3.219772E-03 --5.764808E-02 +5.764808E-02 1.861051E-02 -5.970583E-02 2.070164E-02 -6.739411E-02 +-6.739411E-02 1.063341E-02 6.561669E+01 8.680729E+02 -7.938430E-01 +-7.938430E-01 2.994198E-01 9.278084E-01 1.861899E+00 -1.432236E+00 +-1.432236E+00 7.429647E-01 7.460836E-02 5.946808E-01 --6.140731E-02 +6.140731E-02 3.175177E-01 1.212677E+00 5.125288E-01 --1.952865E-02 +1.952865E-02 5.468421E-01 -2.965796E-01 1.123288E-01 -5.334195E-01 +-5.334195E-01 1.589612E-01 -6.340814E-01 4.874650E-01 -4.264003E-02 +-4.264003E-02 9.109571E-03 -4.323424E-01 3.370329E-01 -1.186876E+00 +-1.186876E+00 9.854644E-01 -2.420825E-01 1.699455E-01 --2.920627E-02 +2.920627E-02 6.816643E-02 -2.684345E-01 9.799236E-02 --1.281596E-01 +1.281596E-01 3.092987E-01 3.746150E-01 1.242044E-01 --1.035056E+00 +1.035056E+00 2.589772E-01 2.005450E-01 2.074622E-01 --5.412719E-01 +5.412719E-01 3.193584E-01 1.070173E+00 3.266747E-01 --2.657850E-01 +2.657850E-01 1.599950E-01 -4.694853E-01 2.738937E-01 -7.761977E-01 +-7.761977E-01 2.561652E-01 3.673179E-02 9.486916E-02 --3.309909E-01 +3.309909E-01 1.095243E-01 1.623761E-01 2.874582E-01 --2.846296E-01 +2.846296E-01 2.430397E-01 7.384842E-01 2.556480E-01 --3.577508E-01 +3.577508E-01 1.763210E-01 -2.917525E-01 1.875646E-01 --1.634324E-01 +1.634324E-01 2.952144E-01 -4.329582E-01 3.418652E-01 -2.719362E-01 +-2.719362E-01 2.278925E-01 2.382728E+01 1.170590E+02 -4.718326E-01 +-4.718326E-01 1.961501E-01 1.612551E-02 2.815245E-02 -6.390587E-01 +-6.390587E-01 1.902968E-01 2.290989E-01 3.758858E-02 -1.568179E-01 +-1.568179E-01 1.509162E-01 -2.363058E-01 6.671396E-02 --4.350800E-02 +4.350800E-02 1.031680E-01 -2.956828E-01 2.515141E-02 --4.835878E-01 +4.835878E-01 8.614200E-02 -5.365970E-02 8.404087E-02 --6.079969E-02 +6.079969E-02 3.684343E-02 -1.313088E-02 1.488843E-02 -2.603258E-02 +-2.603258E-02 2.900625E-02 1.249213E-01 2.737277E-02 -4.491422E-01 +-4.491422E-01 9.482600E-02 -1.095589E-01 3.711500E-02 --2.248159E-01 +2.248159E-01 2.815827E-02 -5.976009E-02 5.887828E-03 --6.097208E-02 +6.097208E-02 5.393315E-02 3.449714E-02 4.332442E-02 --1.030757E-01 +1.030757E-01 2.839453E-02 -4.399117E-01 8.887569E-02 -4.564910E-01 +-4.564910E-01 1.172398E-01 -2.528382E-01 1.217655E-01 -3.443316E-01 +-3.443316E-01 4.275616E-02 5.437008E-02 2.355567E-02 --5.505588E-02 +5.505588E-02 5.479129E-02 -8.326640E-02 3.095858E-02 --1.888781E-01 +1.888781E-01 2.884542E-02 1.981251E-01 1.520694E-02 --5.279866E-02 +5.279866E-02 1.020641E-01 -1.465368E-01 3.070686E-02 --2.356940E-01 +2.356940E-01 7.899657E-02 4.109278E-01 5.291082E-02 -2.572510E-01 +-2.572510E-01 3.420895E-02 8.047875E+00 1.334796E+01 -1.707535E-01 +-1.707535E-01 3.290927E-02 1.024687E-01 1.308811E-02 -1.805451E-01 +-1.805451E-01 1.696222E-02 3.519587E-02 7.546726E-03 -1.034933E-01 +-1.034933E-01 2.224207E-02 -1.580512E-01 2.369625E-02 -4.302961E-02 +-4.302961E-02 1.635623E-02 -2.992903E-02 5.190220E-03 --2.130862E-01 +2.130862E-01 1.186351E-02 -3.321696E-02 7.972404E-03 --4.992040E-02 +4.992040E-02 5.667098E-03 1.261320E-02 2.436872E-03 --8.314024E-04 +8.314024E-04 5.360616E-03 -6.318247E-02 1.644558E-03 -1.373600E-01 +-1.373600E-01 1.030707E-02 1.511677E-03 3.467685E-03 --1.923485E-02 +1.923485E-02 8.106508E-04 -1.180094E-01 4.381376E-03 -2.798056E-02 +-2.798056E-02 4.871288E-03 -7.689499E-02 7.079493E-03 -5.842586E-02 +-5.842586E-02 1.380713E-03 -9.946341E-02 7.085062E-03 -8.061825E-02 +-8.061825E-02 8.679468E-03 -9.229524E-03 9.187483E-03 -1.048310E-01 +-1.048310E-01 3.506026E-03 3.666209E-02 3.259203E-03 --1.190727E-01 +1.190727E-01 4.935341E-03 -7.391655E-02 2.805554E-03 --2.029126E-02 +2.029126E-02 2.497736E-03 2.787185E-02 5.677987E-04 --6.873108E-02 +6.873108E-02 1.287727E-02 -5.262840E-02 3.190440E-03 --3.910911E-02 +3.910911E-02 8.661121E-03 1.076197E-01 5.456176E-03 -7.476066E-02 +-7.476066E-02 2.693605E-03 4.056568E+01 3.389623E+02 -6.428633E-01 +-6.428633E-01 6.128893E-01 4.878518E-01 2.130257E-01 -9.548044E-01 +-9.548044E-01 4.556949E-01 2.234940E-01 1.006817E-01 --1.080276E-01 +1.080276E-01 5.980158E-01 -3.639229E-01 3.120105E-01 --3.237506E-01 +3.237506E-01 3.451548E-01 1.143081E-01 7.924550E-02 --6.456733E-01 +6.456733E-01 2.424413E-01 1.478136E-01 1.458665E-01 --2.134798E-02 +2.134798E-02 9.102875E-02 3.633264E-01 7.386463E-02 -2.213946E-01 +-2.213946E-01 1.253249E-01 -3.153847E-01 1.094273E-01 -7.161113E-01 +-7.161113E-01 2.275500E-01 -2.461979E-01 1.484452E-01 --2.332886E-01 +2.332886E-01 9.715521E-02 -7.029988E-02 1.835254E-02 -1.982842E-01 +-1.982842E-01 9.722998E-02 -2.089693E-01 2.271404E-01 --7.316104E-02 +7.316104E-02 3.974665E-02 -3.266640E-01 8.054809E-02 -5.126088E-01 +-5.126088E-01 3.234942E-01 -3.048753E-01 3.439501E-01 -4.872647E-01 +-4.872647E-01 9.473730E-02 1.590200E-01 3.613462E-02 --4.641787E-01 +4.641787E-01 1.671339E-01 -1.391114E-01 3.581561E-02 --2.209343E-01 +2.209343E-01 1.489367E-02 3.015665E-01 4.265694E-02 --1.334716E-01 +1.334716E-01 2.321929E-01 -3.702914E-01 1.699549E-01 --8.891532E-02 +8.891532E-02 1.708595E-01 6.123686E-01 1.429184E-01 -5.891300E-01 +-5.891300E-01 1.085467E-01 tally 3: 3.862543E+01 2.993190E+02 -5.083613E-01 +-5.083613E-01 2.933365E-01 -4.356793E-01 6.676831E-01 -6.093148E-01 +-6.093148E-01 5.685331E-01 2.512276E-01 1.308652E-01 -1.075955E+00 +-1.075955E+00 4.775270E-01 3.660307E-01 1.627691E-01 --5.402149E-01 +5.402149E-01 2.324946E-01 -3.887573E-01 1.028105E-01 --4.324152E-01 +4.324152E-01 1.015147E-01 3.306993E-02 8.425069E-02 --2.127456E-01 +2.127456E-01 5.435453E-02 2.977294E-01 1.088039E-01 -1.055079E+00 +-1.055079E+00 3.590635E-01 -6.740592E-01 2.606281E-01 --3.329512E-01 +3.329512E-01 1.587428E-01 -1.248691E-01 1.659045E-01 --2.306000E-01 +2.306000E-01 1.062057E-01 9.127791E-02 2.649459E-01 --2.629881E-01 +2.629881E-01 4.786229E-02 2.286813E-01 2.363629E-02 --6.338613E-01 +6.338613E-01 1.118828E-01 7.466647E-01 1.424535E-01 --7.955161E-02 +7.955161E-02 1.003327E-02 1.082691E-01 2.727882E-02 -5.295185E-01 +-5.295185E-01 1.335133E-01 -6.321517E-01 1.422916E-01 --1.236137E-01 +1.236137E-01 2.041422E-01 -5.389265E-02 1.852888E-01 --3.746082E-01 +3.746082E-01 5.580885E-02 1.383528E-01 2.754456E-01 --5.081204E-01 +5.081204E-01 1.886515E-01 -4.022264E-01 1.417397E-01 -3.377771E-01 +-3.377771E-01 6.673888E-02 1.170109E-01 1.783182E-02 -2.097916E-01 +-2.097916E-01 7.139323E-02 1.438678E+01 4.193571E+01 -6.547124E-01 +-6.547124E-01 1.780450E-01 2.207489E-01 2.115835E-01 --4.952323E-02 +4.952323E-02 3.039341E-01 6.681546E-01 1.389250E-01 -4.078026E-02 +-4.078026E-02 4.393667E-02 -8.695509E-01 2.850853E-01 -1.792062E-01 +-1.792062E-01 7.367253E-02 -5.657500E-01 2.115125E-01 -8.525189E-02 +-8.525189E-02 2.541971E-02 5.227867E-02 2.008468E-02 --6.825349E-02 +6.825349E-02 5.316522E-02 3.763076E-01 7.112554E-02 -1.279973E-02 +-1.279973E-02 1.883096E-01 7.775189E-02 6.874374E-02 --1.119537E-01 +1.119537E-01 8.467755E-02 -1.600632E-01 8.650448E-02 --6.210095E-01 +6.210095E-01 1.094309E-01 -9.997484E-02 3.935353E-02 -2.300525E-01 +-2.300525E-01 2.351925E-02 2.486103E-02 3.125565E-02 --1.289518E-02 +1.289518E-02 2.879251E-02 -3.166559E-01 2.931428E-02 -1.379285E-02 +-1.379285E-02 2.416257E-02 1.220552E-02 5.154030E-02 -1.431676E-01 +-1.431676E-01 3.434080E-02 8.148581E-02 4.218412E-02 --8.541678E-03 +8.541678E-03 6.396306E-02 -7.851012E-03 5.799658E-02 --2.435723E-01 +2.435723E-01 6.744263E-02 -2.429877E-01 6.966516E-02 -1.638644E-01 +-1.638644E-01 2.058798E-02 -8.986584E-03 1.374824E-02 --3.547454E-01 +3.547454E-01 7.765460E-02 -1.570173E-01 6.916960E-02 -1.056941E-02 +-1.056941E-02 7.626528E-03 6.400634E+01 8.298077E+02 -3.894111E-01 +-3.894111E-01 8.617494E-01 1.796567E-01 1.065356E+00 -1.561037E+00 +-1.561037E+00 7.701475E-01 -2.237530E-01 2.259442E-01 --1.109999E+00 +1.109999E+00 6.179412E-01 1.636912E+00 7.887441E-01 --4.661183E-01 +4.661183E-01 4.191138E-01 -1.040546E+00 2.971961E-01 --1.044850E-01 +1.044850E-01 1.493530E-01 -4.991935E-01 3.222404E-01 -4.205099E-01 +-4.205099E-01 2.734911E-01 -7.583139E-01 3.000853E-01 -3.750811E-01 +-3.750811E-01 1.348273E-01 -6.355508E-01 3.666139E-01 --5.233787E-01 +5.233787E-01 1.292414E-01 -2.869538E-02 9.115092E-02 --6.851052E-01 +6.851052E-01 3.061040E-01 1.703522E-01 7.300335E-02 --4.541075E-01 +4.541075E-01 4.438507E-01 -2.674857E-01 4.718588E-01 --3.022517E-02 +3.022517E-02 1.136781E-01 5.755596E-01 2.688162E-01 --2.698373E-01 +2.698373E-01 1.403188E-01 8.772347E-01 3.503562E-01 -4.258508E-01 +-4.258508E-01 1.400825E-01 -1.384853E-01 4.924947E-02 -1.009402E-01 +-1.009402E-01 2.039230E-01 -1.339732E-01 4.772083E-02 -3.249636E-01 +-3.249636E-01 4.339747E-01 1.564400E-01 2.703717E-01 --2.536360E-01 +2.536360E-01 8.543919E-02 -3.622063E-01 7.442240E-02 -2.074953E-02 +-2.074953E-02 1.355614E-01 -3.909820E-02 1.007999E-01 --3.162815E-01 +3.162815E-01 9.656425E-02 2.426423E+01 1.215124E+02 -9.628829E-01 +-9.628829E-01 3.563586E-01 2.964625E-01 9.739638E-02 -3.680881E-01 +-3.680881E-01 3.484018E-01 4.339143E-01 7.590564E-02 --4.633394E-02 +4.633394E-02 1.080030E-01 3.091634E-01 1.246585E-01 --4.520500E-02 +4.520500E-02 1.095704E-01 2.479383E-01 1.138276E-01 --6.457108E-02 +6.457108E-02 6.833667E-02 -5.623363E-02 1.087254E-01 --3.675294E-01 +3.675294E-01 9.602246E-02 -1.459951E-01 9.440544E-02 -6.817672E-02 +-6.817672E-02 4.978066E-02 1.076782E-02 1.697440E-01 -1.024501E-02 +-1.024501E-02 1.184830E-01 -1.654178E-01 1.689209E-02 -1.006214E-01 +-1.006214E-01 3.392546E-02 5.070063E-01 7.598100E-02 --2.251704E-01 +2.251704E-01 7.867348E-02 -1.693789E-01 2.069974E-01 -2.790249E-01 +-2.790249E-01 2.674643E-02 3.888604E-01 3.649330E-02 --7.614452E-02 +7.614452E-02 7.098023E-02 1.236282E-02 5.476895E-02 -3.151637E-01 +-3.151637E-01 3.543466E-02 -6.363562E-01 9.323507E-02 --2.808153E-01 +2.808153E-01 8.537981E-02 2.197639E-01 3.393653E-02 --8.660625E-02 +8.660625E-02 1.575544E-02 3.733826E-02 1.449783E-02 --8.800903E-04 +8.800903E-04 3.993931E-02 3.304886E-01 3.099095E-02 -4.149186E-02 +-4.149186E-02 5.375091E-02 2.448819E-01 9.225028E-02 -1.230091E-01 +-1.230091E-01 3.865008E-02 7.600812E+00 1.199814E+01 -8.738539E-01 +-8.738539E-01 3.078183E-01 -2.592305E-01 1.015952E-01 -6.391696E-02 +-6.391696E-02 6.657129E-02 -2.857855E-01 2.216294E-02 -3.516811E-01 +-3.516811E-01 3.429194E-02 4.585144E-02 6.204056E-02 -1.599494E-01 +-1.599494E-01 1.684846E-02 -2.364219E-01 1.550644E-02 --1.197289E-01 +1.197289E-01 8.631394E-02 -1.364517E-01 5.086560E-02 -2.213374E-01 +-2.213374E-01 2.779096E-02 -7.328761E-02 1.216230E-02 --2.476803E-01 +2.476803E-01 2.724500E-02 -6.356296E-02 2.513244E-02 -3.886281E-01 +-3.886281E-01 9.479377E-02 1.006972E-01 1.352120E-02 --6.932242E-02 +6.932242E-02 3.192705E-02 -3.232505E-02 5.592418E-02 --9.582599E-02 +9.582599E-02 1.504811E-02 -2.887999E-01 3.760482E-02 -2.372013E-01 +-2.372013E-01 1.868786E-02 -1.655526E-01 4.720116E-02 --8.611265E-02 +8.611265E-02 2.284310E-02 -2.142116E-01 2.619080E-02 -1.811202E-01 +-1.811202E-01 1.457105E-02 1.430164E-01 2.016598E-02 -4.066031E-01 +-4.066031E-01 7.671356E-02 1.364946E-01 1.385677E-02 --8.357667E-02 +8.357667E-02 1.521943E-02 -2.235270E-02 1.029570E-02 -7.920760E-02 +-7.920760E-02 4.227880E-02 2.622096E-01 2.327728E-02 -7.787296E-03 +-7.787296E-03 2.288300E-02 -1.645219E-02 5.394704E-02 --7.274557E-02 +7.274557E-02 1.075570E-02 4.104875E+01 3.455300E+02 -9.827893E-01 +-9.827893E-01 2.751051E-01 3.227606E-01 1.213711E-01 -1.272840E-02 +-1.272840E-02 2.813639E-01 -1.910394E-01 5.682320E-02 --4.136260E-01 +4.136260E-01 2.444497E-01 -5.123352E-02 3.867174E-01 --4.424857E-02 +4.424857E-02 9.651204E-02 -3.975443E-02 1.867060E-01 --7.618837E-01 +7.618837E-01 1.756891E-01 4.259599E-01 1.146646E-01 --5.658031E-02 +5.658031E-02 1.366891E-01 2.464931E-01 2.181122E-01 -1.593998E-01 +-1.593998E-01 2.666678E-01 -1.928096E-01 1.216164E-01 -7.020992E-01 +-7.020992E-01 1.701086E-01 3.914244E-01 1.772217E-01 --3.285697E-01 +3.285697E-01 1.521826E-01 -2.947923E-02 8.201284E-02 -1.346653E-01 +-1.346653E-01 4.498340E-02 2.112724E-01 9.923303E-02 -8.551910E-02 +-8.551910E-02 8.804286E-03 -3.631005E-01 1.168145E-01 -1.840770E-01 +-1.840770E-01 5.714283E-02 -2.709303E-02 9.381338E-02 -2.104005E-02 +-2.104005E-02 4.479215E-02 4.059493E-01 8.277066E-02 --2.877400E-01 +2.877400E-01 8.584721E-02 4.881128E-02 1.864179E-01 --8.584545E-02 +8.584545E-02 4.421744E-02 -4.392466E-01 6.260373E-02 -3.143214E-02 +-3.143214E-02 8.184856E-02 -5.630973E-01 1.323469E-01 -8.010498E-02 +-8.010498E-02 1.096975E-01 1.818829E-01 1.717701E-02 -1.062149E-01 +-1.062149E-01 5.400365E-02 tally 4: 3.862543E+01 2.993190E+02 -5.083613E-01 +-5.083613E-01 2.933365E-01 -4.356793E-01 6.676831E-01 -6.093148E-01 +-6.093148E-01 5.685331E-01 2.512276E-01 1.308652E-01 -1.075955E+00 +-1.075955E+00 4.775270E-01 3.660307E-01 1.627691E-01 --5.402149E-01 +5.402149E-01 2.324946E-01 -3.887573E-01 1.028105E-01 --4.324152E-01 +4.324152E-01 1.015147E-01 3.306993E-02 8.425069E-02 --2.127456E-01 +2.127456E-01 5.435453E-02 2.977294E-01 1.088039E-01 -1.055079E+00 +-1.055079E+00 3.590635E-01 -6.740592E-01 2.606281E-01 --3.329512E-01 +3.329512E-01 1.587428E-01 -1.248691E-01 1.659045E-01 --2.306000E-01 +2.306000E-01 1.062057E-01 9.127791E-02 2.649459E-01 --2.629881E-01 +2.629881E-01 4.786229E-02 2.286813E-01 2.363629E-02 --6.338613E-01 +6.338613E-01 1.118828E-01 7.466647E-01 1.424535E-01 --7.955161E-02 +7.955161E-02 1.003327E-02 1.082691E-01 2.727882E-02 -5.295185E-01 +-5.295185E-01 1.335133E-01 -6.321517E-01 1.422916E-01 --1.236137E-01 +1.236137E-01 2.041422E-01 -5.389265E-02 1.852888E-01 --3.746082E-01 +3.746082E-01 5.580885E-02 1.383528E-01 2.754456E-01 --5.081204E-01 +5.081204E-01 1.886515E-01 -4.022264E-01 1.417397E-01 -3.377771E-01 +-3.377771E-01 6.673888E-02 1.170109E-01 1.783182E-02 -2.097916E-01 +-2.097916E-01 7.139323E-02 1.438678E+01 4.193571E+01 -6.547124E-01 +-6.547124E-01 1.780450E-01 2.207489E-01 2.115835E-01 --4.952323E-02 +4.952323E-02 3.039341E-01 6.681546E-01 1.389250E-01 -4.078026E-02 +-4.078026E-02 4.393667E-02 -8.695509E-01 2.850853E-01 -1.792062E-01 +-1.792062E-01 7.367253E-02 -5.657500E-01 2.115125E-01 -8.525189E-02 +-8.525189E-02 2.541971E-02 5.227867E-02 2.008468E-02 --6.825349E-02 +6.825349E-02 5.316522E-02 3.763076E-01 7.112554E-02 -1.279973E-02 +-1.279973E-02 1.883096E-01 7.775189E-02 6.874374E-02 --1.119537E-01 +1.119537E-01 8.467755E-02 -1.600632E-01 8.650448E-02 --6.210095E-01 +6.210095E-01 1.094309E-01 -9.997484E-02 3.935353E-02 -2.300525E-01 +-2.300525E-01 2.351925E-02 2.486103E-02 3.125565E-02 --1.289518E-02 +1.289518E-02 2.879251E-02 -3.166559E-01 2.931428E-02 -1.379285E-02 +-1.379285E-02 2.416257E-02 1.220552E-02 5.154030E-02 -1.431676E-01 +-1.431676E-01 3.434080E-02 8.148581E-02 4.218412E-02 --8.541678E-03 +8.541678E-03 6.396306E-02 -7.851012E-03 5.799658E-02 --2.435723E-01 +2.435723E-01 6.744263E-02 -2.429877E-01 6.966516E-02 -1.638644E-01 +-1.638644E-01 2.058798E-02 -8.986584E-03 1.374824E-02 --3.547454E-01 +3.547454E-01 7.765460E-02 -1.570173E-01 6.916960E-02 -1.056941E-02 +-1.056941E-02 7.626528E-03 6.400634E+01 8.298077E+02 -3.894111E-01 +-3.894111E-01 8.617494E-01 1.796567E-01 1.065356E+00 -1.561037E+00 +-1.561037E+00 7.701475E-01 -2.237530E-01 2.259442E-01 --1.109999E+00 +1.109999E+00 6.179412E-01 1.636912E+00 7.887441E-01 --4.661183E-01 +4.661183E-01 4.191138E-01 -1.040546E+00 2.971961E-01 --1.044850E-01 +1.044850E-01 1.493530E-01 -4.991935E-01 3.222404E-01 -4.205099E-01 +-4.205099E-01 2.734911E-01 -7.583139E-01 3.000853E-01 -3.750811E-01 +-3.750811E-01 1.348273E-01 -6.355508E-01 3.666139E-01 --5.233787E-01 +5.233787E-01 1.292414E-01 -2.869538E-02 9.115092E-02 --6.851052E-01 +6.851052E-01 3.061040E-01 1.703522E-01 7.300335E-02 --4.541075E-01 +4.541075E-01 4.438507E-01 -2.674857E-01 4.718588E-01 --3.022517E-02 +3.022517E-02 1.136781E-01 5.755596E-01 2.688162E-01 --2.698373E-01 +2.698373E-01 1.403188E-01 8.772347E-01 3.503562E-01 -4.258508E-01 +-4.258508E-01 1.400825E-01 -1.384853E-01 4.924947E-02 -1.009402E-01 +-1.009402E-01 2.039230E-01 -1.339732E-01 4.772083E-02 -3.249636E-01 +-3.249636E-01 4.339747E-01 1.564400E-01 2.703717E-01 --2.536360E-01 +2.536360E-01 8.543919E-02 -3.622063E-01 7.442240E-02 -2.074953E-02 +-2.074953E-02 1.355614E-01 -3.909820E-02 1.007999E-01 --3.162815E-01 +3.162815E-01 9.656425E-02 2.426423E+01 1.215124E+02 -9.628829E-01 +-9.628829E-01 3.563586E-01 2.964625E-01 9.739638E-02 -3.680881E-01 +-3.680881E-01 3.484018E-01 4.339143E-01 7.590564E-02 --4.633394E-02 +4.633394E-02 1.080030E-01 3.091634E-01 1.246585E-01 --4.520500E-02 +4.520500E-02 1.095704E-01 2.479383E-01 1.138276E-01 --6.457108E-02 +6.457108E-02 6.833667E-02 -5.623363E-02 1.087254E-01 --3.675294E-01 +3.675294E-01 9.602246E-02 -1.459951E-01 9.440544E-02 -6.817672E-02 +-6.817672E-02 4.978066E-02 1.076782E-02 1.697440E-01 -1.024501E-02 +-1.024501E-02 1.184830E-01 -1.654178E-01 1.689209E-02 -1.006214E-01 +-1.006214E-01 3.392546E-02 5.070063E-01 7.598100E-02 --2.251704E-01 +2.251704E-01 7.867348E-02 -1.693789E-01 2.069974E-01 -2.790249E-01 +-2.790249E-01 2.674643E-02 3.888604E-01 3.649330E-02 --7.614452E-02 +7.614452E-02 7.098023E-02 1.236282E-02 5.476895E-02 -3.151637E-01 +-3.151637E-01 3.543466E-02 -6.363562E-01 9.323507E-02 --2.808153E-01 +2.808153E-01 8.537981E-02 2.197639E-01 3.393653E-02 --8.660625E-02 +8.660625E-02 1.575544E-02 3.733826E-02 1.449783E-02 --8.800903E-04 +8.800903E-04 3.993931E-02 3.304886E-01 3.099095E-02 -4.149186E-02 +-4.149186E-02 5.375091E-02 2.448819E-01 9.225028E-02 -1.230091E-01 +-1.230091E-01 3.865008E-02 7.600812E+00 1.199814E+01 -8.738539E-01 +-8.738539E-01 3.078183E-01 -2.592305E-01 1.015952E-01 -6.391696E-02 +-6.391696E-02 6.657129E-02 -2.857855E-01 2.216294E-02 -3.516811E-01 +-3.516811E-01 3.429194E-02 4.585144E-02 6.204056E-02 -1.599494E-01 +-1.599494E-01 1.684846E-02 -2.364219E-01 1.550644E-02 --1.197289E-01 +1.197289E-01 8.631394E-02 -1.364517E-01 5.086560E-02 -2.213374E-01 +-2.213374E-01 2.779096E-02 -7.328761E-02 1.216230E-02 --2.476803E-01 +2.476803E-01 2.724500E-02 -6.356296E-02 2.513244E-02 -3.886281E-01 +-3.886281E-01 9.479377E-02 1.006972E-01 1.352120E-02 --6.932242E-02 +6.932242E-02 3.192705E-02 -3.232505E-02 5.592418E-02 --9.582599E-02 +9.582599E-02 1.504811E-02 -2.887999E-01 3.760482E-02 -2.372013E-01 +-2.372013E-01 1.868786E-02 -1.655526E-01 4.720116E-02 --8.611265E-02 +8.611265E-02 2.284310E-02 -2.142116E-01 2.619080E-02 -1.811202E-01 +-1.811202E-01 1.457105E-02 1.430164E-01 2.016598E-02 -4.066031E-01 +-4.066031E-01 7.671356E-02 1.364946E-01 1.385677E-02 --8.357667E-02 +8.357667E-02 1.521943E-02 -2.235270E-02 1.029570E-02 -7.920760E-02 +-7.920760E-02 4.227880E-02 2.622096E-01 2.327728E-02 -7.787296E-03 +-7.787296E-03 2.288300E-02 -1.645219E-02 5.394704E-02 --7.274557E-02 +7.274557E-02 1.075570E-02 4.104875E+01 3.455300E+02 -9.827893E-01 +-9.827893E-01 2.751051E-01 3.227606E-01 1.213711E-01 -1.272840E-02 +-1.272840E-02 2.813639E-01 -1.910394E-01 5.682320E-02 --4.136260E-01 +4.136260E-01 2.444497E-01 -5.123352E-02 3.867174E-01 --4.424857E-02 +4.424857E-02 9.651204E-02 -3.975443E-02 1.867060E-01 --7.618837E-01 +7.618837E-01 1.756891E-01 4.259599E-01 1.146646E-01 --5.658031E-02 +5.658031E-02 1.366891E-01 2.464931E-01 2.181122E-01 -1.593998E-01 +-1.593998E-01 2.666678E-01 -1.928096E-01 1.216164E-01 -7.020992E-01 +-7.020992E-01 1.701086E-01 3.914244E-01 1.772217E-01 --3.285697E-01 +3.285697E-01 1.521826E-01 -2.947923E-02 8.201284E-02 -1.346653E-01 +-1.346653E-01 4.498340E-02 2.112724E-01 9.923303E-02 -8.551910E-02 +-8.551910E-02 8.804286E-03 -3.631005E-01 1.168145E-01 -1.840770E-01 +-1.840770E-01 5.714283E-02 -2.709303E-02 9.381338E-02 -2.104005E-02 +-2.104005E-02 4.479215E-02 4.059493E-01 8.277066E-02 --2.877400E-01 +2.877400E-01 8.584721E-02 4.881128E-02 1.864179E-01 --8.584545E-02 +8.584545E-02 4.421744E-02 -4.392466E-01 6.260373E-02 -3.143214E-02 +-3.143214E-02 8.184856E-02 -5.630973E-01 1.323469E-01 -8.010498E-02 +-8.010498E-02 1.096975E-01 1.818829E-01 1.717701E-02 -1.062149E-01 +-1.062149E-01 5.400365E-02 diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat index 79c89b7708..2b14a72560 100644 --- a/tests/test_score_nuscatter_yn/results_true.dat +++ b/tests/test_score_nuscatter_yn/results_true.dat @@ -6,33 +6,33 @@ tally 1: tally 2: 2.514000E+01 6.511880E+01 --2.222467E-01 +2.222467E-01 2.881247E-02 3.019176E-01 3.014833E-02 -8.459006E-04 +-8.459006E-04 4.773570E-02 9.596964E-02 1.009754E-02 --4.314855E-02 +4.314855E-02 6.207871E-03 4.607677E-02 9.205573E-03 --2.345994E-03 +2.345994E-03 1.243004E-02 9.577397E-02 6.605519E-03 --2.821584E-02 +2.821584E-02 3.834286E-03 -1.077389E-01 6.570217E-03 --1.106443E-01 +1.106443E-01 1.006436E-02 1.322104E-01 7.721677E-03 -1.315548E-02 +-1.315548E-02 5.488918E-04 -2.792171E-02 5.816161E-03 --1.994370E-02 +1.994370E-02 1.169674E-03 diff --git a/tests/test_score_scatter_yn/results_true.dat b/tests/test_score_scatter_yn/results_true.dat index 20b7672eb5..fb6b4749d1 100644 --- a/tests/test_score_scatter_yn/results_true.dat +++ b/tests/test_score_scatter_yn/results_true.dat @@ -6,51 +6,51 @@ tally 1: tally 2: 1.485000E+01 4.439790E+01 -8.440076E-02 +-8.440076E-02 1.135203E-02 8.198663E-02 3.887429E-02 -1.358080E-01 +-1.358080E-01 2.890416E-02 -3.544823E-02 9.843339E-04 -1.542072E-01 +-1.542072E-01 8.228126E-03 1.057111E-01 3.758100E-03 -1.647870E-02 +-1.647870E-02 4.827841E-03 1.378297E-01 1.566876E-02 --4.676778E-02 +4.676778E-02 4.809366E-03 1.966204E-02 7.447981E-04 --1.889258E-02 +1.889258E-02 6.841953E-04 1.337703E-02 1.250077E-03 -1.044684E-01 +-1.044684E-01 6.969498E-03 -1.177995E-02 8.208715E-03 -1.940058E-04 +-1.940058E-04 5.128759E-03 -2.165868E-02 1.335569E-03 -3.080886E-02 +-3.080886E-02 4.544434E-04 1.039856E-03 1.209631E-03 -1.317068E-02 +-1.317068E-02 1.469722E-03 -6.432758E-02 2.106736E-03 --3.323023E-02 +3.323023E-02 4.513838E-03 2.683700E-02 1.146747E-03 -3.494912E-02 +-3.494912E-02 1.006153E-03 6.289525E-02 3.700145E-03 diff --git a/tests/test_score_total_yn/results_true.dat b/tests/test_score_total_yn/results_true.dat index 81bef81d22..b416b05ec3 100644 --- a/tests/test_score_total_yn/results_true.dat +++ b/tests/test_score_total_yn/results_true.dat @@ -112,101 +112,101 @@ tally 2: 0.000000E+00 9.780506E-01 1.942072E-01 -4.170415E-02 +-4.170415E-02 7.581469E-04 -2.419728E-03 6.296241E-04 -8.163997E-03 +-8.163997E-03 4.785197E-04 3.971909E-03 1.363304E-04 --1.585497E-02 +1.585497E-02 1.295251E-04 -7.029875E-02 1.208194E-03 -1.524070E-02 +-1.524070E-02 2.828843E-04 -2.141105E-02 2.953327E-04 -2.147623E-02 +-2.147623E-02 2.390414E-04 5.592040E-04 1.720605E-04 --3.022066E-03 +3.022066E-03 1.843720E-04 1.489821E-02 9.193290E-05 -1.354668E-02 +-1.354668E-02 2.551940E-04 -5.692690E-04 3.013453E-04 --2.324582E-02 +2.324582E-02 2.170615E-04 1.883012E-02 1.045949E-04 -3.997107E-03 +-3.997107E-03 1.674058E-04 1.616443E-02 2.046286E-04 --1.625747E-02 +1.625747E-02 1.851351E-04 1.120209E-02 2.028649E-04 --4.240284E-03 +4.240284E-03 4.019011E-05 1.535379E-02 9.872559E-05 -8.973926E-03 +-8.973926E-03 1.448680E-04 -3.933227E-03 4.305328E-04 1.767552E+01 6.295417E+01 -1.458308E-01 +-1.458308E-01 8.239551E-03 1.976485E-01 7.360520E-02 -2.647182E-01 +-2.647182E-01 5.347815E-02 1.828025E-01 1.840743E-02 --1.865994E-01 +1.865994E-01 2.843407E-02 -6.438995E-02 8.898045E-03 -1.416445E-01 +-1.416445E-01 3.839856E-02 -3.298894E-01 2.672141E-02 -1.462639E-01 +-1.462639E-01 1.225250E-02 -6.410138E-02 3.766615E-02 --4.701705E-02 +4.701705E-02 1.968428E-03 2.953056E-02 2.358647E-02 -1.717672E-01 +-1.717672E-01 5.877351E-02 1.927497E-02 1.358953E-02 --1.708870E-01 +1.708870E-01 1.502033E-02 4.453803E-02 1.622532E-02 -2.076143E-02 +-2.076143E-02 1.850686E-03 1.111325E-01 8.415150E-03 --1.249594E-01 +1.249594E-01 7.491280E-03 1.381757E-02 1.537264E-02 -7.286234E-03 +-7.286234E-03 9.057874E-03 3.162973E-01 3.303388E-02 --1.012773E-01 +1.012773E-01 8.345375E-03 -5.238963E-02 3.920421E-02 @@ -262,51 +262,51 @@ tally 2: 0.000000E+00 3.863588E+00 3.013300E+00 --5.075749E-02 +5.075749E-02 1.018210E-03 3.445344E-02 5.778215E-03 -6.239642E-02 +-6.239642E-02 4.107408E-03 -1.475495E-02 7.971898E-04 --5.809323E-02 +5.809323E-02 3.039895E-03 -2.510339E-02 3.529134E-04 -9.731680E-03 +-9.731680E-03 1.221628E-03 -5.815144E-02 1.403261E-03 -4.936694E-02 +-4.936694E-02 6.481626E-04 5.141985E-03 1.343973E-03 --1.515105E-02 +1.515105E-02 3.044735E-04 4.474521E-03 1.155268E-03 -6.855877E-02 +-6.855877E-02 4.048417E-03 -2.701967E-05 1.279041E-03 --2.197636E-02 +2.197636E-02 2.843662E-04 -1.780381E-02 8.441574E-04 --2.916634E-02 +2.916634E-02 2.530602E-03 2.289834E-02 2.201375E-03 --3.283424E-02 +3.283424E-02 7.615219E-04 9.623726E-03 7.614092E-04 --2.808239E-02 +2.808239E-02 1.500381E-03 4.835419E-02 6.933678E-04 -2.636221E-02 +-2.636221E-02 2.230834E-04 -4.957463E-02 1.939266E-03 @@ -362,51 +362,51 @@ tally 2: 0.000000E+00 5.356594E+01 5.839391E+02 -1.198882E+00 +-1.198882E+00 3.391100E-01 3.952398E-01 5.729760E-01 -1.045726E+00 +-1.045726E+00 4.419194E-01 2.683170E-01 1.872580E-01 --5.059349E-01 +5.059349E-01 2.592209E-01 4.561651E-01 1.253696E-01 -4.273775E-01 +-4.273775E-01 3.509266E-01 -6.300496E-01 2.102051E-01 -3.094705E-01 +-3.094705E-01 1.410278E-01 -6.840225E-01 1.971765E-01 --4.123355E-02 +4.123355E-02 3.962538E-02 -1.554557E-01 2.784362E-02 -4.698631E-01 +-4.698631E-01 1.867413E-01 -7.016026E-02 3.059344E-02 --2.922284E-01 +2.922284E-01 8.680517E-02 -1.252431E-01 3.180591E-02 --1.825937E-01 +1.825937E-01 8.626653E-02 1.637960E-01 1.329538E-01 --6.662867E-01 +6.662867E-01 1.497985E-01 4.662585E-01 7.552145E-02 --1.198254E-03 +1.198254E-03 2.020899E-01 5.281410E-01 9.615758E-02 --6.396211E-02 +6.396211E-02 1.806992E-01 -1.898620E-01 1.113751E-01 @@ -513,101 +513,101 @@ tally 3: 0.000000E+00 9.300000E-01 1.839000E-01 --4.056201E-03 +4.056201E-03 8.670884E-04 -2.262959E-02 2.263780E-03 -4.568371E-02 +-4.568371E-02 4.078305E-03 6.023055E-02 1.099458E-03 -2.468374E-02 +-2.468374E-02 3.403931E-03 -8.676202E-02 2.444658E-03 --2.075016E-02 +2.075016E-02 5.432442E-03 1.101095E-02 3.129947E-04 --8.689134E-03 +8.689134E-03 2.422445E-03 -1.097503E-02 4.670673E-04 --4.979355E-02 +4.979355E-02 1.791811E-03 1.769845E-02 6.074665E-04 -1.473469E-02 +-1.473469E-02 1.257671E-03 -1.133757E-02 1.555143E-03 --1.730195E-02 +1.730195E-02 1.841949E-03 -1.191492E-02 1.859105E-03 --9.038577E-03 +9.038577E-03 4.401577E-04 1.770047E-02 4.158291E-04 --1.492809E-02 +1.492809E-02 5.488168E-04 7.970152E-02 1.597910E-03 --3.741348E-02 +3.741348E-02 5.704935E-04 2.078478E-02 5.379832E-04 -1.355930E-02 +-1.355930E-02 6.747758E-04 3.416200E-02 8.262470E-04 1.739000E+01 6.083290E+01 -2.434171E-01 +-2.434171E-01 3.049063E-02 -1.278707E-01 9.585267E-02 -2.597328E-01 +-2.597328E-01 8.692607E-02 2.496700E-01 3.750933E-02 -1.309937E-01 +-1.309937E-01 4.217907E-02 -1.863241E-01 1.738581E-02 --1.292679E-01 +1.292679E-01 1.799004E-02 -3.543191E-01 3.682107E-02 --1.904413E-01 +1.904413E-01 1.455250E-02 -7.093238E-02 1.473997E-02 --1.920412E-01 +1.920412E-01 1.308864E-02 1.566093E-01 1.913492E-02 -2.499642E-01 +-2.499642E-01 3.036874E-02 -2.323022E-01 3.794368E-02 --6.361729E-02 +6.361729E-02 3.266166E-02 4.688479E-02 2.806712E-02 --9.796563E-02 +9.796563E-02 1.419748E-02 1.000847E-02 3.233262E-02 --7.570231E-02 +7.570231E-02 4.626536E-03 1.489091E-01 1.159345E-02 --2.236285E-01 +2.236285E-01 1.480084E-02 2.461305E-01 1.643844E-02 --1.773523E-02 +1.773523E-02 1.626036E-03 6.570774E-02 1.069893E-02 @@ -663,51 +663,51 @@ tally 3: 0.000000E+00 4.160000E+00 3.501000E+00 -9.464171E-02 +-9.464171E-02 8.682833E-03 8.467800E-02 1.402624E-02 --1.283471E-02 +1.283471E-02 2.630439E-02 1.859869E-01 1.189528E-02 --1.910311E-02 +1.910311E-02 2.907370E-03 -2.542253E-01 2.143851E-02 -4.021473E-02 +-4.021473E-02 5.812599E-03 -1.242140E-01 1.017873E-02 -2.934198E-02 +-2.934198E-02 2.409920E-03 5.719767E-02 2.211520E-03 --3.023903E-02 +3.023903E-02 2.870625E-03 1.092479E-01 6.089989E-03 --1.604743E-02 +1.604743E-02 1.110224E-02 3.811062E-03 5.234112E-03 --5.446762E-02 +5.446762E-02 5.323411E-03 -3.868978E-02 4.949255E-03 --1.384260E-01 +1.384260E-01 4.903532E-03 -3.761889E-02 2.524889E-03 -6.079772E-02 +-6.079772E-02 2.328339E-03 1.956623E-03 4.096814E-03 --1.716402E-03 +1.716402E-03 2.022751E-03 -1.108600E-01 3.227014E-03 -2.447622E-03 +-2.447622E-03 4.075421E-03 1.582493E-02 4.847858E-03 @@ -763,51 +763,51 @@ tally 3: 0.000000E+00 5.213000E+01 5.552351E+02 -6.019876E-01 +-6.019876E-01 2.938936E-01 2.126970E-01 3.363271E-01 -6.928646E-01 +-6.928646E-01 3.077152E-01 -2.976474E-01 5.830705E-02 --7.804821E-01 +7.804821E-01 3.967156E-01 5.737502E-01 1.090147E-01 -2.867929E-01 +-2.867929E-01 1.312720E-01 -4.735578E-01 6.714577E-02 -6.340442E-02 +-6.340442E-02 4.240623E-02 -1.594570E-01 1.167021E-01 -5.403124E-02 +-5.403124E-02 6.452745E-02 -2.670969E-01 5.822561E-02 -3.033558E-01 +-3.033558E-01 4.890487E-02 -3.515557E-01 5.069681E-02 --2.257462E-01 +2.257462E-01 4.682933E-02 -1.449924E-02 1.625521E-02 --2.809498E-01 +2.809498E-01 6.883451E-02 1.904808E-01 1.004755E-01 --2.570005E-01 +2.570005E-01 4.301248E-02 9.493600E-02 7.708499E-02 -2.804222E-01 +-2.804222E-01 4.455703E-02 3.199914E-01 7.435651E-02 -2.818069E-04 +-2.818069E-04 7.231318E-02 3.689494E-01 1.349712E-01 @@ -914,101 +914,101 @@ tally 4: 0.000000E+00 9.453374E-01 1.815824E-01 -4.552571E-02 +-4.552571E-02 8.689847E-04 4.192526E-03 6.095248E-04 -4.085060E-03 +-4.085060E-03 3.488081E-04 3.074303E-02 3.709785E-04 --1.949067E-02 +1.949067E-02 1.995057E-04 -7.372260E-02 1.709765E-03 -5.140901E-03 +-5.140901E-03 6.268082E-05 -2.589014E-02 1.616678E-04 --1.683116E-02 +1.683116E-02 2.122512E-04 -1.074659E-02 1.087471E-04 --3.762844E-03 +3.762844E-03 3.439135E-05 1.365793E-02 5.255161E-05 --5.869374E-05 +5.869374E-05 4.060049E-04 -7.715004E-03 3.629588E-04 --8.240120E-03 +8.240120E-03 5.192031E-04 1.662861E-02 5.038262E-04 -2.845811E-03 +-2.845811E-03 2.843348E-04 1.826833E-03 1.104947E-05 -5.596885E-04 +-5.596885E-04 1.922661E-05 1.398723E-02 1.025178E-04 --1.733988E-02 +1.733988E-02 1.184228E-04 1.250057E-02 1.447801E-04 -5.450018E-03 +-5.450018E-03 3.725923E-05 2.390947E-02 6.837656E-04 1.739000E+01 6.083290E+01 -2.434171E-01 +-2.434171E-01 3.049063E-02 -1.278707E-01 9.585267E-02 -2.597328E-01 +-2.597328E-01 8.692607E-02 2.496700E-01 3.750933E-02 -1.309937E-01 +-1.309937E-01 4.217907E-02 -1.863241E-01 1.738581E-02 --1.292679E-01 +1.292679E-01 1.799004E-02 -3.543191E-01 3.682107E-02 --1.904413E-01 +1.904413E-01 1.455250E-02 -7.093238E-02 1.473997E-02 --1.920412E-01 +1.920412E-01 1.308864E-02 1.566093E-01 1.913492E-02 -2.499642E-01 +-2.499642E-01 3.036874E-02 -2.323022E-01 3.794368E-02 --6.361729E-02 +6.361729E-02 3.266166E-02 4.688479E-02 2.806712E-02 --9.796563E-02 +9.796563E-02 1.419748E-02 1.000847E-02 3.233262E-02 --7.570231E-02 +7.570231E-02 4.626536E-03 1.489091E-01 1.159345E-02 --2.236285E-01 +2.236285E-01 1.480084E-02 2.461305E-01 1.643844E-02 --1.773523E-02 +1.773523E-02 1.626036E-03 6.570774E-02 1.069893E-02 @@ -1064,51 +1064,51 @@ tally 4: 0.000000E+00 4.160000E+00 3.501000E+00 -9.464171E-02 +-9.464171E-02 8.682833E-03 8.467800E-02 1.402624E-02 --1.283471E-02 +1.283471E-02 2.630439E-02 1.859869E-01 1.189528E-02 --1.910311E-02 +1.910311E-02 2.907370E-03 -2.542253E-01 2.143851E-02 -4.021473E-02 +-4.021473E-02 5.812599E-03 -1.242140E-01 1.017873E-02 -2.934198E-02 +-2.934198E-02 2.409920E-03 5.719767E-02 2.211520E-03 --3.023903E-02 +3.023903E-02 2.870625E-03 1.092479E-01 6.089989E-03 --1.604743E-02 +1.604743E-02 1.110224E-02 3.811062E-03 5.234112E-03 --5.446762E-02 +5.446762E-02 5.323411E-03 -3.868978E-02 4.949255E-03 --1.384260E-01 +1.384260E-01 4.903532E-03 -3.761889E-02 2.524889E-03 -6.079772E-02 +-6.079772E-02 2.328339E-03 1.956623E-03 4.096814E-03 --1.716402E-03 +1.716402E-03 2.022751E-03 -1.108600E-01 3.227014E-03 -2.447622E-03 +-2.447622E-03 4.075421E-03 1.582493E-02 4.847858E-03 @@ -1164,51 +1164,51 @@ tally 4: 0.000000E+00 5.213000E+01 5.552351E+02 -6.019876E-01 +-6.019876E-01 2.938936E-01 2.126970E-01 3.363271E-01 -6.928646E-01 +-6.928646E-01 3.077152E-01 -2.976474E-01 5.830705E-02 --7.804821E-01 +7.804821E-01 3.967156E-01 5.737502E-01 1.090147E-01 -2.867929E-01 +-2.867929E-01 1.312720E-01 -4.735578E-01 6.714577E-02 -6.340442E-02 +-6.340442E-02 4.240623E-02 -1.594570E-01 1.167021E-01 -5.403124E-02 +-5.403124E-02 6.452745E-02 -2.670969E-01 5.822561E-02 -3.033558E-01 +-3.033558E-01 4.890487E-02 -3.515557E-01 5.069681E-02 --2.257462E-01 +2.257462E-01 4.682933E-02 -1.449924E-02 1.625521E-02 --2.809498E-01 +2.809498E-01 6.883451E-02 1.904808E-01 1.004755E-01 --2.570005E-01 +2.570005E-01 4.301248E-02 9.493600E-02 7.708499E-02 -2.804222E-01 +-2.804222E-01 4.455703E-02 3.199914E-01 7.435651E-02 -2.818069E-04 +-2.818069E-04 7.231318E-02 3.689494E-01 1.349712E-01