diff --git a/openmc/statepoint.py b/openmc/statepoint.py index 23aad6427..f0085395c 100644 --- a/openmc/statepoint.py +++ b/openmc/statepoint.py @@ -370,14 +370,15 @@ class StatePoint(object): tally.derivative = self.tally_derivatives[deriv_id] # Read all filters - filters_group = self._f['tallies/filters'] - filter_ids = group['filters'].value - n_filters = len(filter_ids) - for filter_id in filter_ids: - filter_group = filters_group['filter {}'.format(filter_id)] - new_filter = openmc.Filter.from_hdf5(filter_group, - meshes=self.meshes) - tally.filters.append(new_filter) + n_filters = group['n_filters'].value + if n_filters > 0: + filter_ids = group['filters'].value + filters_group = self._f['tallies/filters'] + for filter_id in filter_ids: + filter_group = filters_group['filter {}'.format(filter_id)] + new_filter = openmc.Filter.from_hdf5(filter_group, + meshes=self.meshes) + tally.filters.append(new_filter) # Read nuclide bins nuclide_names = group['nuclides'].value diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index d602414bd..8b67f7a8f 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -379,9 +379,9 @@ contains ! Determine number of filters energy_filters = check_for_node(node_mesh, "energy") if (energy_filters) then - n_cmfd_filters = 4 + n_cmfd_filters = 5 else - n_cmfd_filters = 2 + n_cmfd_filters = 3 end if ! Extend filters array so we can add CMFD filters @@ -429,6 +429,21 @@ contains end select end if + ! Duplicate the mesh filter for the surface current tally since other + ! tallies use this filter and we need to change the dimension + i_filt = i_filt + 1 + allocate(MeshFilter :: filters(i_filt) % obj) + select type (filt => filters(i_filt) % obj) + type is (MeshFilter) + filt % id = i_filt + ! We need to increase the dimension by one since we also need + ! currents coming into and out of the boundary mesh cells. + filt % n_bins = product(m % dimension + 1) + filt % mesh = n_user_meshes + 1 + ! Add filter to dictionary + call filter_dict % add_key(filt % id, i_filt) + end select + ! Set up surface filter i_filt = i_filt + 1 allocate(SurfaceFilter :: filters(i_filt) % obj) @@ -565,11 +580,11 @@ contains ! Set the surface filter index in the tally find_filter array n_filter = n_filter + 1 - t % find_filter(FILTER_SURFACE) = n_cmfd_filters + t % find_filter(FILTER_SURFACE) = n_filter ! Allocate and set filters allocate(t % filter(n_filter)) - t % filter(1) = n_user_filters + 1 + t % filter(1) = n_user_filters + n_cmfd_filters - 1 t % filter(n_filter) = n_user_filters + n_cmfd_filters if (energy_filters) then t % filter(2) = n_user_filters + 2 @@ -587,12 +602,6 @@ contains ! Set macro bins t % score_bins(1) = SCORE_CURRENT t % type = TALLY_SURFACE_CURRENT - - ! We need to increase the dimension by one since we also need - ! currents coming into and out of the boundary mesh cells. - i_filt = t % filter(t % find_filter(FILTER_MESH)) - filters(i_filt) % obj % n_bins = product(m % dimension + 1) - end if end do diff --git a/src/input_xml.F90 b/src/input_xml.F90 index db06814cc..b1c0cc49c 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -3348,7 +3348,9 @@ contains ! Allocate and store filter user ids allocate(temp_filter(n_filter)) - call get_node_array(node_tal, "filters", temp_filter) + if (n_filter > 0) then + call get_node_array(node_tal, "filters", temp_filter) + end if do j = 1, n_filter ! Get pointer to filter @@ -3798,19 +3800,6 @@ contains &filter.") end if - ! Declare the type of the mesh filter - select type(filt => filters(i_filt) % obj) - type is (MeshFilter) - - ! Get pointer to mesh - i_mesh = filt % mesh - m => meshes(i_mesh) - - ! We need to increase the dimension by one since we also need - ! currents coming into and out of the boundary mesh cells. - filt % n_bins = product(m % dimension + 1) - end select - ! Copy filter indices to temporary array allocate(temp_filter(size(t % filter) + 1)) temp_filter(1:size(t % filter)) = t % filter @@ -3826,10 +3815,14 @@ contains ! Increment number of user filters n_user_filters = n_user_filters + 1 + ! Get index of the new surface filter + i_filt = n_filters + ! Add surface filter - allocate(SurfaceFilter :: filters(n_filters) % obj) - select type (filt => filters(n_filters) % obj) + allocate(SurfaceFilter :: filters(i_filt) % obj) + select type (filt => filters(i_filt) % obj) type is (SurfaceFilter) + filt % id = i_filt filt % n_bins = 4 * m % n_dimension allocate(filt % surfaces(4 * m % n_dimension)) if (m % n_dimension == 1) then @@ -3843,12 +3836,15 @@ contains IN_FRONT, IN_BOTTOM, IN_TOP /) end if filt % current = .true. + + ! Add filter to dictionary + call filter_dict % add_key(filt % id, i_filt) end select t % find_filter(FILTER_SURFACE) = n_filter + t % filter(n_filter) = i_filt case ('events') t % score_bins(j) = SCORE_EVENTS - case ('elastic', '(n,elastic)') t % score_bins(j) = ELASTIC case ('(n,2nd)') diff --git a/src/state_point.F90 b/src/state_point.F90 index 206e6cc8d..e4c9a43ae 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -263,8 +263,8 @@ contains end select call write_dataset(tally_group, "n_realizations", & tally % n_realizations) - call write_dataset(tally_group, "n_filters", size(tally % filter)) + call write_dataset(tally_group, "n_filters", size(tally % filter)) if (size(tally % filter) > 0) then ! Write IDs of filters allocate(id_array(size(tally % filter))) diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat index 32745dad1..3e8b22fc6 100644 --- a/tests/test_asymmetric_lattice/inputs_true.dat +++ b/tests/test_asymmetric_lattice/inputs_true.dat @@ -217,8 +217,11 @@ + + 27 + - + 10000 nu-fission diff --git a/tests/test_cmfd_feed/tallies.xml b/tests/test_cmfd_feed/tallies.xml index 37edcecc2..c86971114 100644 --- a/tests/test_cmfd_feed/tallies.xml +++ b/tests/test_cmfd_feed/tallies.xml @@ -8,8 +8,13 @@ 10 1 1 + + mesh + 1 + + - + 1 flux diff --git a/tests/test_cmfd_nofeed/tallies.xml b/tests/test_cmfd_nofeed/tallies.xml index 37edcecc2..c86971114 100644 --- a/tests/test_cmfd_nofeed/tallies.xml +++ b/tests/test_cmfd_nofeed/tallies.xml @@ -8,8 +8,13 @@ 10 1 1 + + mesh + 1 + + - + 1 flux diff --git a/tests/test_complex_cell/tallies.xml b/tests/test_complex_cell/tallies.xml index d1a7d387e..e0509e6a8 100644 --- a/tests/test_complex_cell/tallies.xml +++ b/tests/test_complex_cell/tallies.xml @@ -1,7 +1,14 @@ + + + cell + 1 2 3 4 + + - + 1 total + diff --git a/tests/test_confidence_intervals/tallies.xml b/tests/test_confidence_intervals/tallies.xml index 0e1fe213c..65ff255fb 100644 --- a/tests/test_confidence_intervals/tallies.xml +++ b/tests/test_confidence_intervals/tallies.xml @@ -1,9 +1,14 @@ + + cell + 1 + + - + 1 flux - \ No newline at end of file + diff --git a/tests/test_diff_tally/inputs_true.dat b/tests/test_diff_tally/inputs_true.dat index 0d75e48c6..0385224d5 100644 --- a/tests/test_diff_tally/inputs_true.dat +++ b/tests/test_diff_tally/inputs_true.dat @@ -310,122 +310,123 @@ + + 1 3 + + + 0.0 0.625 20000000.0 + - + 10000 flux 1 - + 10000 flux 2 - + 10000 flux 3 - + 10000 flux 4 - + 10000 flux 5 - + 10000 total U235 total absorption scatter fission nu-fission 1 - + 10000 total U235 total absorption scatter fission nu-fission 2 - + 10000 total U235 total absorption scatter fission nu-fission 3 - + 10000 total U235 total absorption scatter fission nu-fission 4 - + 10000 total U235 total absorption scatter fission nu-fission 5 - + 10000 absorption analog 1 - + 10000 absorption analog 2 - + 10000 absorption analog 3 - + 10000 absorption analog 4 - + 10000 absorption analog 5 - - + 10000 10001 total U235 nu-fission scatter 1 - - + 10000 10001 total U235 nu-fission scatter 2 - - + 10000 10001 U235 nu-fission scatter 3 - - + 10000 10001 U235 nu-fission scatter 4 - - + 10000 10001 U235 nu-fission scatter 5 diff --git a/tests/test_diff_tally/test_diff_tally.py b/tests/test_diff_tally/test_diff_tally.py index 84aa18156..51e4cd5eb 100644 --- a/tests/test_diff_tally/test_diff_tally.py +++ b/tests/test_diff_tally/test_diff_tally.py @@ -127,6 +127,7 @@ class DiffTallyTestHarness(PyAPITestHarness): # Extract the relevant data as a CSV string. cols = ('d_material', 'd_nuclide', 'd_variable', 'score', 'mean', 'std. dev.') + print(df.to_csv(None, columns=cols, index=False, float_format='%.7e')) return df.to_csv(None, columns=cols, index=False, float_format='%.7e') diff --git a/tests/test_energy_cutoff/inputs_true.dat b/tests/test_energy_cutoff/inputs_true.dat index 7f67288d1..a2d2967c0 100644 --- a/tests/test_energy_cutoff/inputs_true.dat +++ b/tests/test_energy_cutoff/inputs_true.dat @@ -32,8 +32,11 @@ + + 0.0 4.0 + - + 10000 flux diff --git a/tests/test_filter_distribcell/case-1/tallies.xml b/tests/test_filter_distribcell/case-1/tallies.xml index e9b952a55..1e7061f21 100644 --- a/tests/test_filter_distribcell/case-1/tallies.xml +++ b/tests/test_filter_distribcell/case-1/tallies.xml @@ -1,22 +1,24 @@ + + distribcell + 201 + + + + cell + 201 + + - - - 201 - - - total + 1 + total - - - 201 - - - total + 2 + total diff --git a/tests/test_filter_distribcell/case-2/tallies.xml b/tests/test_filter_distribcell/case-2/tallies.xml index 55738312b..b2efa76a5 100644 --- a/tests/test_filter_distribcell/case-2/tallies.xml +++ b/tests/test_filter_distribcell/case-2/tallies.xml @@ -1,13 +1,14 @@ + + cell + 201 203 205 207 + + - - - 201 203 205 207 - - - total + 1 + total diff --git a/tests/test_filter_distribcell/case-3/tallies.xml b/tests/test_filter_distribcell/case-3/tallies.xml index 30c9426e0..aed192854 100644 --- a/tests/test_filter_distribcell/case-3/tallies.xml +++ b/tests/test_filter_distribcell/case-3/tallies.xml @@ -1,58 +1,64 @@ + + cell + 1 + + + + distribcell + 1 + + + + cell + 60 + + + + distribcell + 60 + + + + cell + 27 + + + + distribcell + 27 + + - - - 1 - - - total + 1 + total - - - 1 - - - total + 2 + total - - - 60 - - - total + 3 + total - - - 60 - - - total + 4 + total - - - 27 - - - total + 5 + total - - - 27 - - - total + 6 + total diff --git a/tests/test_filter_distribcell/case-4/tallies.xml b/tests/test_filter_distribcell/case-4/tallies.xml index b46de5f4e..b923c030b 100644 --- a/tests/test_filter_distribcell/case-4/tallies.xml +++ b/tests/test_filter_distribcell/case-4/tallies.xml @@ -1,7 +1,14 @@ - - + + + distribcell + 101 + + + + 1 total - + + diff --git a/tests/test_filter_energyfun/inputs_true.dat b/tests/test_filter_energyfun/inputs_true.dat index 48f6c5033..260b28c12 100644 --- a/tests/test_filter_energyfun/inputs_true.dat +++ b/tests/test_filter_energyfun/inputs_true.dat @@ -310,12 +310,16 @@ + + 1e-05 0.369 1000.0 100000.0 600000.0 1000000.0 2000000.0 4000000.0 30000000.0 + 0.1 0.1 0.1333 0.158 0.18467 0.25618 0.4297 0.48 0.48 + Am241 (n,gamma) - + 10000 Am241 (n,gamma) diff --git a/tests/test_filter_mesh/inputs_true.dat b/tests/test_filter_mesh/inputs_true.dat index 1d9d6ac5c..9c196e404 100644 --- a/tests/test_filter_mesh/inputs_true.dat +++ b/tests/test_filter_mesh/inputs_true.dat @@ -327,28 +327,37 @@ -182.07 -182.07 -183.0 182.07 182.07 183.0 + + 1 + + + 2 + + + 3 + - + 10000 total - + 10000 current - + 10001 total - + 10001 current - + 10002 total - + 10002 current diff --git a/tests/test_mg_tallies/inputs_true.dat b/tests/test_mg_tallies/inputs_true.dat index 8120c8681..6d4458444 100644 --- a/tests/test_mg_tallies/inputs_true.dat +++ b/tests/test_mg_tallies/inputs_true.dat @@ -102,129 +102,127 @@ 0.0 0.0 0.0 10 10 5 + + 1 + + + 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 + + + 0.0 20000000.0 + + + 0.0 20000000.0 + + + 1e-05 0.0635 10.0 100.0 1000.0 500000.0 1000000.0 20000000.0 + + + 1e-05 0.0635 10.0 100.0 1000.0 500000.0 1000000.0 20000000.0 + - + 10004 total absorption flux fission nu-fission analog - + 10004 total absorption flux fission nu-fission tracklength - - + 10005 10000 total absorption flux fission nu-fission scatter nu-scatter analog - - + 10005 10000 total absorption flux fission nu-fission collision - - + 10005 10000 total absorption flux fission nu-fission tracklength - - - + 10005 10000 10001 scatter nu-scatter nu-fission - - + 10005 10002 total absorption flux fission nu-fission scatter nu-scatter analog - - + 10005 10002 total absorption flux fission nu-fission collision - - + 10005 10002 total absorption flux fission nu-fission tracklength - - - + 10005 10002 10003 scatter nu-scatter nu-fission - + 10004 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission analog - + 10004 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission tracklength - - + 10005 10000 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission scatter nu-scatter analog - - + 10005 10000 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission collision - - + 10005 10000 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission tracklength - - - + 10005 10000 10001 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu scatter nu-scatter nu-fission - - + 10005 10002 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission scatter nu-scatter analog - - + 10005 10002 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission collision - - + 10005 10002 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu total absorption fission nu-fission tracklength - - - + 10005 10002 10003 uo2_ang uo2_ang_mu uo2_iso uo2_iso_mu clad_ang clad_ang_mu clad_iso clad_iso_mu lwtr_ang lwtr_ang_mu lwtr_iso lwtr_iso_mu scatter nu-scatter nu-fission diff --git a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat index e31ee4d04..a70e5c533 100644 --- a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat +++ b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat @@ -50,224 +50,197 @@ + + 10000 + + + 0.0 0.625 20000000.0 + + + 0.0 0.625 20000000.0 + + + 10001 + + + 10002 + - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10006 total nu-fission analog - - + 10000 10001 total flux analog - - - + 10000 10001 10006 total nu-scatter-P3 analog - - - + 10000 10001 10006 total nu-scatter analog - - - + 10000 10001 10006 total scatter analog - - + 10013 10001 total flux tracklength - - + 10013 10001 total total tracklength - - + 10013 10001 total flux tracklength - - + 10013 10001 total absorption tracklength - - + 10013 10001 total flux analog - - - + 10013 10001 10006 total nu-fission analog - - + 10013 10001 total flux analog - - - + 10013 10001 10006 total nu-scatter-P3 analog - - - + 10013 10001 10006 total nu-scatter analog - - - + 10013 10001 10006 total scatter analog - - + 10026 10001 total flux tracklength - - + 10026 10001 total total tracklength - - + 10026 10001 total flux tracklength - - + 10026 10001 total absorption tracklength - - + 10026 10001 total flux analog - - - + 10026 10001 10006 total nu-fission analog - - + 10026 10001 total flux analog - - - + 10026 10001 10006 total nu-scatter-P3 analog - - - + 10026 10001 10006 total nu-scatter analog - - - + 10026 10001 10006 total scatter analog diff --git a/tests/test_mgxs_library_condense/inputs_true.dat b/tests/test_mgxs_library_condense/inputs_true.dat index 79c7ea049..bf8caf6d7 100644 --- a/tests/test_mgxs_library_condense/inputs_true.dat +++ b/tests/test_mgxs_library_condense/inputs_true.dat @@ -50,1361 +50,1139 @@ + + 10000 + + + 0.0 0.625 20000000.0 + + + 0.0 0.625 20000000.0 + + + 0.0 20000000.0 + + + 1 2 3 4 5 6 + + + 10001 + + + 10002 + - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total nu-scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total nu-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total kappa-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - + 10000 10001 total flux analog - - + 10000 10001 total nu-scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-fission analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter-0 analog - - - + 10000 10001 10004 total scatter-0 analog - - + 10000 10045 total nu-fission analog - - + 10000 10004 total nu-fission analog - - + 10000 10045 total prompt-nu-fission analog - - + 10000 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total inverse-velocity tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total prompt-nu-fission tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10045 total delayed-nu-fission analog - - - + 10000 10058 10004 total delayed-nu-fission analog - - + 10000 10001 total nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total decay-rate tracklength - - + 10000 10001 total flux analog - - - - + 10000 10058 10001 10004 total delayed-nu-fission analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux analog - - + 10073 10004 total scatter-1 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux analog - - + 10073 10004 total nu-scatter-1 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total absorption tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total absorption tracklength - - + 10073 10001 total fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total nu-fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total kappa-fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - + 10073 10001 total flux analog - - + 10073 10001 total nu-scatter analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total scatter-P3 analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total nu-scatter-P3 analog - - - + 10073 10001 10004 total nu-scatter analog - - - + 10073 10001 10004 total scatter analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total nu-fission analog - - - + 10073 10001 10004 total scatter analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - - + 10073 10001 10004 total scatter-P3 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - - + 10073 10001 10004 total scatter-P3 analog - - - + 10073 10001 10004 total nu-scatter-0 analog - - - + 10073 10001 10004 total scatter-0 analog - - + 10073 10045 total nu-fission analog - - + 10073 10004 total nu-fission analog - - + 10073 10045 total prompt-nu-fission analog - - + 10073 10004 total prompt-nu-fission analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total inverse-velocity tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total prompt-nu-fission tracklength - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total prompt-nu-fission analog - - + 10073 10001 total flux tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10045 total delayed-nu-fission analog - - - + 10073 10058 10004 total delayed-nu-fission analog - - + 10073 10001 total nu-fission tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10001 total decay-rate tracklength - - + 10073 10001 total flux analog - - - - + 10073 10058 10001 10004 total delayed-nu-fission analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux analog - - + 10146 10004 total scatter-1 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux analog - - + 10146 10004 total nu-scatter-1 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total absorption tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total absorption tracklength - - + 10146 10001 total fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total nu-fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total kappa-fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - + 10146 10001 total flux analog - - + 10146 10001 total nu-scatter analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total scatter-P3 analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total nu-scatter-P3 analog - - - + 10146 10001 10004 total nu-scatter analog - - - + 10146 10001 10004 total scatter analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total nu-fission analog - - - + 10146 10001 10004 total scatter analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - - + 10146 10001 10004 total scatter-P3 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - - + 10146 10001 10004 total scatter-P3 analog - - - + 10146 10001 10004 total nu-scatter-0 analog - - - + 10146 10001 10004 total scatter-0 analog - - + 10146 10045 total nu-fission analog - - + 10146 10004 total nu-fission analog - - + 10146 10045 total prompt-nu-fission analog - - + 10146 10004 total prompt-nu-fission analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total inverse-velocity tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total prompt-nu-fission tracklength - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total prompt-nu-fission analog - - + 10146 10001 total flux tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10045 total delayed-nu-fission analog - - - + 10146 10058 10004 total delayed-nu-fission analog - - + 10146 10001 total nu-fission tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10001 total decay-rate tracklength - - + 10146 10001 total flux analog - - - - + 10146 10058 10001 10004 total delayed-nu-fission analog diff --git a/tests/test_mgxs_library_distribcell/inputs_true.dat b/tests/test_mgxs_library_distribcell/inputs_true.dat index 79862b8bc..e51dc3405 100644 --- a/tests/test_mgxs_library_distribcell/inputs_true.dat +++ b/tests/test_mgxs_library_distribcell/inputs_true.dat @@ -77,455 +77,386 @@ + + 10000 + + + 0.0 20000000.0 + + + 0.0 20000000.0 + + + 1 2 3 4 5 6 + - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total nu-scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total nu-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total kappa-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - + 10000 10001 total flux analog - - + 10000 10001 total nu-scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-fission analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter-0 analog - - - + 10000 10001 10004 total scatter-0 analog - - + 10000 10001 total nu-fission analog - - + 10000 10004 total nu-fission analog - - + 10000 10001 total prompt-nu-fission analog - - + 10000 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total inverse-velocity tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total prompt-nu-fission tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission analog - - - + 10000 10058 10004 total delayed-nu-fission analog - - + 10000 10001 total nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total decay-rate tracklength - - + 10000 10001 total flux analog - - - - + 10000 10058 10001 10004 total delayed-nu-fission analog diff --git a/tests/test_mgxs_library_hdf5/inputs_true.dat b/tests/test_mgxs_library_hdf5/inputs_true.dat index 79c7ea049..bf8caf6d7 100644 --- a/tests/test_mgxs_library_hdf5/inputs_true.dat +++ b/tests/test_mgxs_library_hdf5/inputs_true.dat @@ -50,1361 +50,1139 @@ + + 10000 + + + 0.0 0.625 20000000.0 + + + 0.0 0.625 20000000.0 + + + 0.0 20000000.0 + + + 1 2 3 4 5 6 + + + 10001 + + + 10002 + - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total nu-scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total nu-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total kappa-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - + 10000 10001 total flux analog - - + 10000 10001 total nu-scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-fission analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter-0 analog - - - + 10000 10001 10004 total scatter-0 analog - - + 10000 10045 total nu-fission analog - - + 10000 10004 total nu-fission analog - - + 10000 10045 total prompt-nu-fission analog - - + 10000 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total inverse-velocity tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total prompt-nu-fission tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10045 total delayed-nu-fission analog - - - + 10000 10058 10004 total delayed-nu-fission analog - - + 10000 10001 total nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total decay-rate tracklength - - + 10000 10001 total flux analog - - - - + 10000 10058 10001 10004 total delayed-nu-fission analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux analog - - + 10073 10004 total scatter-1 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux analog - - + 10073 10004 total nu-scatter-1 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total absorption tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total absorption tracklength - - + 10073 10001 total fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total nu-fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total kappa-fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - + 10073 10001 total flux analog - - + 10073 10001 total nu-scatter analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total scatter-P3 analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total nu-scatter-P3 analog - - - + 10073 10001 10004 total nu-scatter analog - - - + 10073 10001 10004 total scatter analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total nu-fission analog - - - + 10073 10001 10004 total scatter analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - - + 10073 10001 10004 total scatter-P3 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - - + 10073 10001 10004 total scatter-P3 analog - - - + 10073 10001 10004 total nu-scatter-0 analog - - - + 10073 10001 10004 total scatter-0 analog - - + 10073 10045 total nu-fission analog - - + 10073 10004 total nu-fission analog - - + 10073 10045 total prompt-nu-fission analog - - + 10073 10004 total prompt-nu-fission analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total inverse-velocity tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total prompt-nu-fission tracklength - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total prompt-nu-fission analog - - + 10073 10001 total flux tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10045 total delayed-nu-fission analog - - - + 10073 10058 10004 total delayed-nu-fission analog - - + 10073 10001 total nu-fission tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10001 total decay-rate tracklength - - + 10073 10001 total flux analog - - - - + 10073 10058 10001 10004 total delayed-nu-fission analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux analog - - + 10146 10004 total scatter-1 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux analog - - + 10146 10004 total nu-scatter-1 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total absorption tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total absorption tracklength - - + 10146 10001 total fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total nu-fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total kappa-fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - + 10146 10001 total flux analog - - + 10146 10001 total nu-scatter analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total scatter-P3 analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total nu-scatter-P3 analog - - - + 10146 10001 10004 total nu-scatter analog - - - + 10146 10001 10004 total scatter analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total nu-fission analog - - - + 10146 10001 10004 total scatter analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - - + 10146 10001 10004 total scatter-P3 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - - + 10146 10001 10004 total scatter-P3 analog - - - + 10146 10001 10004 total nu-scatter-0 analog - - - + 10146 10001 10004 total scatter-0 analog - - + 10146 10045 total nu-fission analog - - + 10146 10004 total nu-fission analog - - + 10146 10045 total prompt-nu-fission analog - - + 10146 10004 total prompt-nu-fission analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total inverse-velocity tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total prompt-nu-fission tracklength - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total prompt-nu-fission analog - - + 10146 10001 total flux tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10045 total delayed-nu-fission analog - - - + 10146 10058 10004 total delayed-nu-fission analog - - + 10146 10001 total nu-fission tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10001 total decay-rate tracklength - - + 10146 10001 total flux analog - - - - + 10146 10058 10001 10004 total delayed-nu-fission analog diff --git a/tests/test_mgxs_library_mesh/inputs_true.dat b/tests/test_mgxs_library_mesh/inputs_true.dat index b0db8a9c4..9d65a9807 100644 --- a/tests/test_mgxs_library_mesh/inputs_true.dat +++ b/tests/test_mgxs_library_mesh/inputs_true.dat @@ -314,455 +314,386 @@ -100.0 -100.0 100.0 100.0 + + 1 + + + 0.0 20000000.0 + + + 0.0 20000000.0 + + + 1 2 3 4 5 6 + - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total nu-scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total nu-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total kappa-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - + 10000 10001 total flux analog - - + 10000 10001 total nu-scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-fission analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter-0 analog - - - + 10000 10001 10004 total scatter-0 analog - - + 10000 10001 total nu-fission analog - - + 10000 10004 total nu-fission analog - - + 10000 10001 total prompt-nu-fission analog - - + 10000 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total inverse-velocity tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total prompt-nu-fission tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission analog - - - + 10000 10058 10004 total delayed-nu-fission analog - - + 10000 10001 total nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total decay-rate tracklength - - + 10000 10001 total flux analog - - - - + 10000 10058 10001 10004 total delayed-nu-fission analog diff --git a/tests/test_mgxs_library_no_nuclides/inputs_true.dat b/tests/test_mgxs_library_no_nuclides/inputs_true.dat index 79c7ea049..bf8caf6d7 100644 --- a/tests/test_mgxs_library_no_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_no_nuclides/inputs_true.dat @@ -50,1361 +50,1139 @@ + + 10000 + + + 0.0 0.625 20000000.0 + + + 0.0 0.625 20000000.0 + + + 0.0 20000000.0 + + + 1 2 3 4 5 6 + + + 10001 + + + 10002 + - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 total nu-scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total absorption tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total nu-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total kappa-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - + 10000 10001 total flux analog - - + 10000 10001 total nu-scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total nu-fission analog - - - + 10000 10001 10004 total scatter analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total scatter tracklength - - - + 10000 10001 10004 total scatter-P3 analog - - - + 10000 10001 10004 total nu-scatter-0 analog - - - + 10000 10001 10004 total scatter-0 analog - - + 10000 10045 total nu-fission analog - - + 10000 10004 total nu-fission analog - - + 10000 10045 total prompt-nu-fission analog - - + 10000 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - + 10000 10001 total inverse-velocity tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 total prompt-nu-fission tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10004 total prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10045 total delayed-nu-fission analog - - - + 10000 10058 10004 total delayed-nu-fission analog - - + 10000 10001 total nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total delayed-nu-fission tracklength - - - + 10000 10058 10001 total decay-rate tracklength - - + 10000 10001 total flux analog - - - - + 10000 10058 10001 10004 total delayed-nu-fission analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux analog - - + 10073 10004 total scatter-1 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total total tracklength - - + 10073 10001 total flux analog - - + 10073 10004 total nu-scatter-1 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total absorption tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total absorption tracklength - - + 10073 10001 total fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total nu-fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total kappa-fission tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - + 10073 10001 total flux analog - - + 10073 10001 total nu-scatter analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total scatter-P3 analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total nu-scatter-P3 analog - - - + 10073 10001 10004 total nu-scatter analog - - - + 10073 10001 10004 total scatter analog - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total nu-fission analog - - - + 10073 10001 10004 total scatter analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - - + 10073 10001 10004 total scatter-P3 analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total scatter tracklength - - - + 10073 10001 10004 total scatter-P3 analog - - - + 10073 10001 10004 total nu-scatter-0 analog - - - + 10073 10001 10004 total scatter-0 analog - - + 10073 10045 total nu-fission analog - - + 10073 10004 total nu-fission analog - - + 10073 10045 total prompt-nu-fission analog - - + 10073 10004 total prompt-nu-fission analog - - + 10073 10001 total flux tracklength - - + 10073 10001 total inverse-velocity tracklength - - + 10073 10001 total flux tracklength - - + 10073 10001 total prompt-nu-fission tracklength - - + 10073 10001 total flux analog - - - + 10073 10001 10004 total prompt-nu-fission analog - - + 10073 10001 total flux tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10045 total delayed-nu-fission analog - - - + 10073 10058 10004 total delayed-nu-fission analog - - + 10073 10001 total nu-fission tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10001 total delayed-nu-fission tracklength - - - + 10073 10058 10001 total decay-rate tracklength - - + 10073 10001 total flux analog - - - - + 10073 10058 10001 10004 total delayed-nu-fission analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux analog - - + 10146 10004 total scatter-1 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total total tracklength - - + 10146 10001 total flux analog - - + 10146 10004 total nu-scatter-1 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total absorption tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total absorption tracklength - - + 10146 10001 total fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total nu-fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total kappa-fission tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - + 10146 10001 total flux analog - - + 10146 10001 total nu-scatter analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total scatter-P3 analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total nu-scatter-P3 analog - - - + 10146 10001 10004 total nu-scatter analog - - - + 10146 10001 10004 total scatter analog - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total nu-fission analog - - - + 10146 10001 10004 total scatter analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - - + 10146 10001 10004 total scatter-P3 analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total scatter tracklength - - - + 10146 10001 10004 total scatter-P3 analog - - - + 10146 10001 10004 total nu-scatter-0 analog - - - + 10146 10001 10004 total scatter-0 analog - - + 10146 10045 total nu-fission analog - - + 10146 10004 total nu-fission analog - - + 10146 10045 total prompt-nu-fission analog - - + 10146 10004 total prompt-nu-fission analog - - + 10146 10001 total flux tracklength - - + 10146 10001 total inverse-velocity tracklength - - + 10146 10001 total flux tracklength - - + 10146 10001 total prompt-nu-fission tracklength - - + 10146 10001 total flux analog - - - + 10146 10001 10004 total prompt-nu-fission analog - - + 10146 10001 total flux tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10045 total delayed-nu-fission analog - - - + 10146 10058 10004 total delayed-nu-fission analog - - + 10146 10001 total nu-fission tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10001 total delayed-nu-fission tracklength - - - + 10146 10058 10001 total decay-rate tracklength - - + 10146 10001 total flux analog - - - - + 10146 10058 10001 10004 total delayed-nu-fission analog diff --git a/tests/test_mgxs_library_nuclides/inputs_true.dat b/tests/test_mgxs_library_nuclides/inputs_true.dat index 89541b4d5..7a16a9afa 100644 --- a/tests/test_mgxs_library_nuclides/inputs_true.dat +++ b/tests/test_mgxs_library_nuclides/inputs_true.dat @@ -50,1127 +50,956 @@ + + 10000 + + + 0.0 0.625 20000000.0 + + + 0.0 0.625 20000000.0 + + + 0.0 20000000.0 + + + 10001 + + + 10002 + - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 total tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 U234 U235 U238 O16 scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 total tracklength - - + 10000 10001 total flux analog - - + 10000 10004 U234 U235 U238 O16 nu-scatter-1 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 absorption tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 absorption tracklength - - + 10000 10001 U234 U235 U238 O16 fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 nu-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 kappa-fission tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 scatter tracklength - - + 10000 10001 total flux analog - - + 10000 10001 U234 U235 U238 O16 nu-scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 U234 U235 U238 O16 scatter-P3 analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 U234 U235 U238 O16 nu-scatter-P3 analog - - - + 10000 10001 10004 U234 U235 U238 O16 nu-scatter analog - - - + 10000 10001 10004 U234 U235 U238 O16 scatter analog - - + 10000 10001 total flux analog - - - + 10000 10001 10004 U234 U235 U238 O16 nu-fission analog - - - + 10000 10001 10004 U234 U235 U238 O16 scatter analog - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 scatter tracklength - - - + 10000 10001 10004 U234 U235 U238 O16 scatter-P3 analog - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 scatter tracklength - - - + 10000 10001 10004 U234 U235 U238 O16 scatter-P3 analog - - - + 10000 10001 10004 U234 U235 U238 O16 nu-scatter-0 analog - - - + 10000 10001 10004 U234 U235 U238 O16 scatter-0 analog - - + 10000 10045 U234 U235 U238 O16 nu-fission analog - - + 10000 10004 U234 U235 U238 O16 nu-fission analog - - + 10000 10045 U234 U235 U238 O16 prompt-nu-fission analog - - + 10000 10004 U234 U235 U238 O16 prompt-nu-fission analog - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 inverse-velocity tracklength - - + 10000 10001 total flux tracklength - - + 10000 10001 U234 U235 U238 O16 prompt-nu-fission tracklength - - + 10000 10001 total flux analog - - - + 10000 10001 10004 U234 U235 U238 O16 prompt-nu-fission analog - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 total tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 total tracklength - - + 10056 10001 total flux analog - - + 10056 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter-1 analog - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 total tracklength - - + 10056 10001 total flux analog - - + 10056 10004 Zr90 Zr91 Zr92 Zr94 Zr96 nu-scatter-1 analog - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 absorption tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 absorption tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 fission tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 fission tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 nu-fission tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 kappa-fission tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 scatter tracklength - - + 10056 10001 total flux analog - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 nu-scatter analog - - + 10056 10001 total flux analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter-P3 analog - - + 10056 10001 total flux analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 nu-scatter-P3 analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 nu-scatter analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter analog - - + 10056 10001 total flux analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 nu-fission analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter analog - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 scatter tracklength - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter-P3 analog - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 scatter tracklength - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter-P3 analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 nu-scatter-0 analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 scatter-0 analog - - + 10056 10045 Zr90 Zr91 Zr92 Zr94 Zr96 nu-fission analog - - + 10056 10004 Zr90 Zr91 Zr92 Zr94 Zr96 nu-fission analog - - + 10056 10045 Zr90 Zr91 Zr92 Zr94 Zr96 prompt-nu-fission analog - - + 10056 10004 Zr90 Zr91 Zr92 Zr94 Zr96 prompt-nu-fission analog - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 inverse-velocity tracklength - - + 10056 10001 total flux tracklength - - + 10056 10001 Zr90 Zr91 Zr92 Zr94 Zr96 prompt-nu-fission tracklength - - + 10056 10001 total flux analog - - - + 10056 10001 10004 Zr90 Zr91 Zr92 Zr94 Zr96 prompt-nu-fission analog - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 total tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 total tracklength - - + 10112 10001 total flux analog - - + 10112 10004 H1 O16 B10 B11 scatter-1 analog - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 total tracklength - - + 10112 10001 total flux analog - - + 10112 10004 H1 O16 B10 B11 nu-scatter-1 analog - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 absorption tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 absorption tracklength - - + 10112 10001 H1 O16 B10 B11 fission tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 fission tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 nu-fission tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 kappa-fission tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 scatter tracklength - - + 10112 10001 total flux analog - - + 10112 10001 H1 O16 B10 B11 nu-scatter analog - - + 10112 10001 total flux analog - - - + 10112 10001 10004 H1 O16 B10 B11 scatter-P3 analog - - + 10112 10001 total flux analog - - - + 10112 10001 10004 H1 O16 B10 B11 nu-scatter-P3 analog - - - + 10112 10001 10004 H1 O16 B10 B11 nu-scatter analog - - - + 10112 10001 10004 H1 O16 B10 B11 scatter analog - - + 10112 10001 total flux analog - - - + 10112 10001 10004 H1 O16 B10 B11 nu-fission analog - - - + 10112 10001 10004 H1 O16 B10 B11 scatter analog - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 scatter tracklength - - - + 10112 10001 10004 H1 O16 B10 B11 scatter-P3 analog - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 scatter tracklength - - - + 10112 10001 10004 H1 O16 B10 B11 scatter-P3 analog - - - + 10112 10001 10004 H1 O16 B10 B11 nu-scatter-0 analog - - - + 10112 10001 10004 H1 O16 B10 B11 scatter-0 analog - - + 10112 10045 H1 O16 B10 B11 nu-fission analog - - + 10112 10004 H1 O16 B10 B11 nu-fission analog - - + 10112 10045 H1 O16 B10 B11 prompt-nu-fission analog - - + 10112 10004 H1 O16 B10 B11 prompt-nu-fission analog - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 inverse-velocity tracklength - - + 10112 10001 total flux tracklength - - + 10112 10001 H1 O16 B10 B11 prompt-nu-fission tracklength - - + 10112 10001 total flux analog - - - + 10112 10001 10004 H1 O16 B10 B11 prompt-nu-fission analog diff --git a/tests/test_score_current/tallies.xml b/tests/test_score_current/tallies.xml index 5da08ef9d..3b8f60adb 100644 --- a/tests/test_score_current/tallies.xml +++ b/tests/test_score_current/tallies.xml @@ -8,14 +8,23 @@ 17 17 17 + + mesh + 1 + + + + energy + 0. 0.253 20.0e6 + + - + 1 current - - + 1 2 current diff --git a/tests/test_sourcepoint_restart/tallies.xml b/tests/test_sourcepoint_restart/tallies.xml index fd7ee66fb..db9b2ed75 100644 --- a/tests/test_sourcepoint_restart/tallies.xml +++ b/tests/test_sourcepoint_restart/tallies.xml @@ -8,15 +8,33 @@ 10. 4. 9. + + mesh + 1 + + + + energy + 0.0 5.0e6 10.0e6 + + + + energyout + 0.0 5.0e6 10.0e6 + + + + cell + 1 + + - - - + 1 2 3 scatter-P3 nu-fission - + 4 fission absorption total flux diff --git a/tests/test_statepoint_restart/tallies.xml b/tests/test_statepoint_restart/tallies.xml index fd7ee66fb..db9b2ed75 100644 --- a/tests/test_statepoint_restart/tallies.xml +++ b/tests/test_statepoint_restart/tallies.xml @@ -8,15 +8,33 @@ 10. 4. 9. + + mesh + 1 + + + + energy + 0.0 5.0e6 10.0e6 + + + + energyout + 0.0 5.0e6 10.0e6 + + + + cell + 1 + + - - - + 1 2 3 scatter-P3 nu-fission - + 4 fission absorption total flux diff --git a/tests/test_tallies/inputs_true.dat b/tests/test_tallies/inputs_true.dat index 88ff72f9b..5543ea917 100644 --- a/tests/test_tallies/inputs_true.dat +++ b/tests/test_tallies/inputs_true.dat @@ -314,160 +314,192 @@ -182.07 -182.07 182.07 182.07 + + -3.14159 -1.885 -0.6283 0.6283 1.885 3.14159 + + + 1 + + + 10 21 22 23 + + + 1 2 3 4 5 6 + + + 0.0 0.253 1000.0 1000000.0 20000000.0 + + + 0.0 0.253 1000.0 1000000.0 20000000.0 + + + 1 2 3 4 + + + -1.0 -0.5 0.0 0.5 1.0 + + + 0.0 0.6283 1.2566 1.885 2.5132 3.14159 + + + 1 2 3 4 6 8 + + + 10 21 22 23 60 + + + 21 22 23 27 28 29 60 + - + 10000 flux tracklength - + 10000 flux analog - - + 10000 10001 flux tracklength - + 10002 total - + 10003 delayed-nu-fission - + 10004 total - + 10005 scatter - - + 10004 10005 scatter nu-fission - + 10006 total - + 10007 scatter nu-scatter - - + 10007 10001 scatter nu-scatter - + 10008 flux tracklength - + 10008 flux analog - - + 10008 10001 flux tracklength - + 10009 total - + 10010 absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable tracklength - + 10010 absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable analog - + 10010 absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable collision - + 10011 flux - + 10011 flux-y5 tracklength - + 10011 flux-y5 analog - + 10011 flux-y5 collision - + 10010 scatter scatter-1 scatter-2 scatter-3 scatter-4 nu-scatter nu-scatter-1 nu-scatter-2 nu-scatter-3 nu-scatter-4 - + 10010 scatter-p4 scatter-y4 nu-scatter-p4 nu-scatter-y3 - + 10010 total - + 10010 U235 total total-y4 tracklength - + 10010 U235 total total-y4 analog - + 10010 U235 total total-y4 collision - + 10010 all total tracklength - + 10010 all total collision - + 10001 all total tracklength - + 10001 U235 total tracklength diff --git a/tests/test_tally_aggregation/inputs_true.dat b/tests/test_tally_aggregation/inputs_true.dat index 8223b8d6a..3b7d6a5c6 100644 --- a/tests/test_tally_aggregation/inputs_true.dat +++ b/tests/test_tally_aggregation/inputs_true.dat @@ -312,9 +312,14 @@ + + 0.0 0.253 1000.0 1000000.0 20000000.0 + + + 60 + - - + 10000 10001 U234 U235 U238 nu-fission total diff --git a/tests/test_tally_arithmetic/inputs_true.dat b/tests/test_tally_arithmetic/inputs_true.dat index 4ade94e93..378750355 100644 --- a/tests/test_tally_arithmetic/inputs_true.dat +++ b/tests/test_tally_arithmetic/inputs_true.dat @@ -317,16 +317,25 @@ -160.0 -160.0 -183.0 160.0 160.0 183.0 + + 1 3 + + + 0.0 2.53e-07 0.001 1.0 20.0 + + + 60 + + + 1 + - - - + 10001 10000 10002 U234 U235 nu-fission total - - + 10000 10003 U238 U235 total fission diff --git a/tests/test_tally_assumesep/tallies.xml b/tests/test_tally_assumesep/tallies.xml index 2de171471..c588eb9e4 100644 --- a/tests/test_tally_assumesep/tallies.xml +++ b/tests/test_tally_assumesep/tallies.xml @@ -3,19 +3,34 @@ true + + cell + 21 + + + + cell + 22 + + + + cell + 23 + + - + 1 total - + 2 total - + 3 total - \ No newline at end of file + diff --git a/tests/test_tally_slice_merge/inputs_true.dat b/tests/test_tally_slice_merge/inputs_true.dat index 93b4af5cd..cd48586b5 100644 --- a/tests/test_tally_slice_merge/inputs_true.dat +++ b/tests/test_tally_slice_merge/inputs_true.dat @@ -315,23 +315,32 @@ -50.0 -50.0 50.0 50.0 + + 21 27 + + + 0.0 0.625 20000000.0 + + + 21 + + + 10000 + - - + 10015 10007 U235 U238 fission nu-fission tracklength - - + 10005 10007 U235 U238 fission nu-fission tracklength - - + 10006 10007 U235 U238 fission nu-fission tracklength