From 4729754ce51e88507158d6312fcd2bb34baabd5b Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 20 Feb 2017 09:49:48 -0600 Subject: [PATCH] Make StatePoint.generations_per_batch consistent with Settings --- docs/source/io_formats/statepoint.rst | 4 ++-- openmc/statepoint.py | 6 +++--- src/state_point.F90 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/io_formats/statepoint.rst b/docs/source/io_formats/statepoint.rst index f2fa223c8..eff590605 100644 --- a/docs/source/io_formats/statepoint.rst +++ b/docs/source/io_formats/statepoint.rst @@ -34,8 +34,8 @@ The current revision of the statepoint file format is 16.0. - **current_batch** (*int*) -- The number of batches already simulated. - **n_inactive** (*int*) -- Number of inactive batches. Only present when `run_mode` is 'eigenvalue'. - - **gen_per_batch** (*int*) -- Number of generations per batch. Only - present when `run_mode` is 'eigenvalue'. + - **generations_per_batch** (*int*) -- Number of generations per + batch. Only present when `run_mode` is 'eigenvalue'. - **k_generation** (*double[]*) -- k-effective for each generation simulated. - **entropy** (*double[]*) -- Shannon entropy for each generation diff --git a/openmc/statepoint.py b/openmc/statepoint.py index 3354181fd..affca1964 100644 --- a/openmc/statepoint.py +++ b/openmc/statepoint.py @@ -52,7 +52,7 @@ class StatePoint(object): Date and time when simulation began entropy : numpy.ndarray Shannon entropy of fission source at each batch - gen_per_batch : Integral + generations_per_batch : int Number of fission generations per batch global_tallies : numpy.ndarray of compound datatype Global tallies for k-effective estimates and leakage. The compound @@ -186,9 +186,9 @@ class StatePoint(object): return None @property - def gen_per_batch(self): + def generations_per_batch(self): if self.run_mode == 'eigenvalue': - return self._f['gen_per_batch'].value + return self._f['generations_per_batch'].value else: return None diff --git a/src/state_point.F90 b/src/state_point.F90 index fcbe9f6da..378fde651 100644 --- a/src/state_point.F90 +++ b/src/state_point.F90 @@ -112,7 +112,7 @@ contains ! Write out information for eigenvalue run if (run_mode == MODE_EIGENVALUE) then call write_dataset(file_id, "n_inactive", n_inactive) - call write_dataset(file_id, "gen_per_batch", gen_per_batch) + call write_dataset(file_id, "generations_per_batch", gen_per_batch) call write_dataset(file_id, "k_generation", k_generation) call write_dataset(file_id, "entropy", entropy) call write_dataset(file_id, "k_col_abs", k_col_abs) @@ -694,7 +694,7 @@ contains ! Read information specific to eigenvalue run if (run_mode == MODE_EIGENVALUE) then call read_dataset(int_array(1), file_id, "n_inactive") - call read_dataset(gen_per_batch, file_id, "gen_per_batch") + call read_dataset(gen_per_batch, file_id, "generations_per_batch") call read_dataset(k_generation(1:restart_batch*gen_per_batch), & file_id, "k_generation") call read_dataset(entropy(1:restart_batch*gen_per_batch), &