From 23427ceccdf906f2bd28e9e3a5761beb9db19cf4 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 21 Sep 2015 11:43:29 +0700 Subject: [PATCH] Get rid of n_nuclides dataset in summary/statepoint --- docs/source/usersguide/output/statepoint.rst | 4 ---- docs/source/usersguide/output/summary.rst | 2 -- openmc/statepoint.py | 4 +--- src/state_point.F90 | 2 -- src/summary.F90 | 3 --- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/docs/source/usersguide/output/statepoint.rst b/docs/source/usersguide/output/statepoint.rst index 42d923351e..b9898ea5db 100644 --- a/docs/source/usersguide/output/statepoint.rst +++ b/docs/source/usersguide/output/statepoint.rst @@ -206,10 +206,6 @@ if (run_mode == MODE_EIGENVALUE) Value for each filter bin of this type. - **/tallies/tally i/n_nuclides** (*int*) - - Number of nuclide bins. If none are specified, this is just one. - **/tallies/tally i/nuclides** (*char[][]*) Values of specified nuclide bins. diff --git a/docs/source/usersguide/output/summary.rst b/docs/source/usersguide/output/summary.rst index 78cf9fbd55..453a48d98d 100644 --- a/docs/source/usersguide/output/summary.rst +++ b/docs/source/usersguide/output/summary.rst @@ -219,8 +219,6 @@ do i = 1, n_tallies end do - **/tallies/tally /n_nuclides** (*int*) - **/tallies/tally /nuclides** (*char[][]*) **/tallies/tally /n_score_bins** (*int*) diff --git a/openmc/statepoint.py b/openmc/statepoint.py index f848fe1e76..c1be201262 100644 --- a/openmc/statepoint.py +++ b/openmc/statepoint.py @@ -408,8 +408,6 @@ class StatePoint(object): tally.add_filter(filter) # Read Nuclide bins - n_nuclides = self._f['{0}{1}/n_nuclides'.format(base, tally_key)].value - nuclide_names = self._f['{0}{1}/nuclides'.format(base, tally_key)].value # Add all Nuclides to the Tally @@ -430,7 +428,7 @@ class StatePoint(object): # Compute and set the filter strides for i in range(n_filters): filter = tally.filters[i] - filter.stride = n_score_bins * n_nuclides + filter.stride = n_score_bins * len(nuclide_names) for j in range(i+1, n_filters): filter.stride *= tally.filters[j].num_bins diff --git a/src/state_point.F90 b/src/state_point.F90 index 700d51b1bb..fbdbdbeba9 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -276,8 +276,6 @@ contains call close_group(filter_group) end do FILTER_LOOP - call write_dataset(tally_group, "n_nuclides", tally%n_nuclide_bins) - ! Set up nuclide bin array and then write allocate(str_array(tally%n_nuclide_bins)) NUCLIDE_LOOP: do j = 1, tally%n_nuclide_bins diff --git a/src/summary.F90 b/src/summary.F90 index 229fda535b..d01d1b4dae 100644 --- a/src/summary.F90 +++ b/src/summary.F90 @@ -551,9 +551,6 @@ contains call close_group(filter_group) end do FILTER_LOOP - ! Write number of nuclide bins - call write_dataset(tally_group, "n_nuclides", t%n_nuclide_bins) - ! Create temporary array for nuclide bins allocate(str_array(t%n_nuclide_bins)) NUCLIDE_LOOP: do j = 1, t%n_nuclide_bins