Revert "Combing for fission site sampling, and delayed neutron emission time (openmc-dev#2992)"

This reverts commit ecb0a33.

Author: nuclearkevin

docs/source/methods/neutron_physics.rst

@@ -290,10 +290,7 @@ create and store fission sites for the following generation. First, the average
 number of prompt and delayed neutrons must be determined to decide whether the
 secondary neutrons will be prompt or delayed. This is important because delayed
 neutrons have a markedly different spectrum from prompt neutrons, one that has a
-lower average energy of emission. Furthermore, in simulations where tracking
-time of neutrons is important, we need to consider the emission time delay of
-the secondary neutrons, which is dependent on the decay constant of the
-delayed neutron precursor. The total number of neutrons emitted
+lower average energy of emission. The total number of neutrons emitted
 :math:`\nu_t` is given as a function of incident energy in the ENDF format. Two
 representations exist for :math:`\nu_t`. The first is a polynomial of order
 :math:`N` with coefficients :math:`c_0,c_1,\dots,c_N`. If :math:`\nu_t` has this
@@ -309,8 +306,8 @@ interpolation law. The number of prompt neutrons released per fission event
 :math:`\nu_p` is also given as a function of incident energy and can be
 specified in a polynomial or tabular format. The number of delayed neutrons
 released per fission event :math:`\nu_d` can only be specified in a tabular
-format. In practice, we only need to determine :math:`\nu_t` and
-:math:`\nu_d`. Once these have been determined, we can calculate the delayed
+format. In practice, we only need to determine :math:`nu_t` and
+:math:`nu_d`. Once these have been determined, we can calculated the delayed
 neutron fraction
 
 .. math::
@@ -338,14 +335,8 @@ neutrons. Otherwise, we produce :math:`\lfloor \nu \rfloor + 1` neutrons. Then,
 for each fission site produced, we sample the outgoing angle and energy
 according to the algorithms given in :ref:`sample-angle` and
 :ref:`sample-energy` respectively. If the neutron is to be born delayed, then
-there is an extra step of sampling a delayed neutron precursor group to get the
-associated secondary energy distribution and the decay constant
-:math:`\lambda`, which is needed to sample the emission delay time :math:`t_d`:
-
-.. math::
-    :label: sample-delay-time
-
-    t_d = -\frac{\ln \xi}{\lambda}.
+there is an extra step of sampling a delayed neutron precursor group since they
+each have an associated secondary energy distribution.
 
 The sampled outgoing angle and energy of fission neutrons along with the
 position of the collision site are stored in an array called the fission

examples/pincell_pulsed/run_pulse.py

@@ -150,7 +150,6 @@ extern double source_rejection_fraction; //!< Minimum fraction of source sites
 
 extern int
   max_history_splits; //!< maximum number of particle splits for weight windows
-extern int max_secondaries;       //!< maximum number of secondaries in the bank
 extern int64_t ssw_max_particles; //!< maximum number of particles to be
                                   //!< banked on surfaces per process
 extern int64_t ssw_max_files;     //!< maximum number of surface source files

include/openmc/settings.h

@@ -128,10 +128,6 @@ class Settings:
         Maximum number of times a particle can split during a history
 
         .. versionadded:: 0.13
-    max_secondaries : int
-        Maximum secondary bank size
-
-        .. versionadded:: 0.15.3
     max_tracks : int
         Maximum number of tracks written to a track file (per MPI process).
 
@@ -435,7 +431,6 @@ def __init__(self, **kwargs):
         self._weight_window_checkpoints = {}
         self._max_history_splits = None
         self._max_tracks = None
-        self._max_secondaries = None
         self._use_decay_photons = None
 
         self._random_ray = {}
@@ -1142,16 +1137,6 @@ def max_history_splits(self, value: int):
         cv.check_greater_than('max particle splits', value, 0)
         self._max_history_splits = value
 
-    @property
-    def max_secondaries(self) -> int:
-        return self._max_secondaries
-
-    @max_secondaries.setter
-    def max_secondaries(self, value: int):
-        cv.check_type('maximum secondary bank size', value, Integral)
-        cv.check_greater_than('max secondary bank size', value, 0)
-        self._max_secondaries = value
-
     @property
     def max_tracks(self) -> int:
         return self._max_tracks
@@ -1688,11 +1673,6 @@ def _create_max_history_splits_subelement(self, root):
             elem = ET.SubElement(root, "max_history_splits")
             elem.text = str(self._max_history_splits)
 
-    def _create_max_secondaries_subelement(self, root):
-        if self._max_secondaries is not None:
-            elem = ET.SubElement(root, "max_secondaries")
-            elem.text = str(self._max_secondaries)
-
     def _create_max_tracks_subelement(self, root):
         if self._max_tracks is not None:
             elem = ET.SubElement(root, "max_tracks")
@@ -2093,11 +2073,6 @@ def _max_history_splits_from_xml_element(self, root):
         if text is not None:
             self.max_history_splits = int(text)
 
-    def _max_secondaries_from_xml_element(self, root):
-        text = get_text(root, 'max_secondaries')
-        if text is not None:
-            self.max_secondaries = int(text)
-
     def _max_tracks_from_xml_element(self, root):
         text = get_text(root, 'max_tracks')
         if text is not None:
@@ -2219,7 +2194,6 @@ def to_xml_element(self, mesh_memo=None):
         self._create_weight_window_checkpoints_subelement(element)
         self._create_max_history_splits_subelement(element)
         self._create_max_tracks_subelement(element)
-        self._create_max_secondaries_subelement(element)
         self._create_random_ray_subelement(element, mesh_memo)
         self._create_use_decay_photons_subelement(element)
         self._create_source_rejection_fraction_subelement(element)
@@ -2328,7 +2302,6 @@ def from_xml_element(cls, elem, meshes=None):
         settings._weight_window_checkpoints_from_xml_element(elem)
         settings._max_history_splits_from_xml_element(elem)
         settings._max_tracks_from_xml_element(elem)
-        settings._max_secondaries_from_xml_element(elem)
         settings._random_ray_from_xml_element(elem)
         settings._use_decay_photons_from_xml_element(elem)
         settings._source_rejection_fraction_from_xml_element(elem)

openmc/settings.py

@@ -127,8 +127,30 @@ void synchronize_bank()
       "No fission sites banked on MPI rank " + std::to_string(mpi::rank));
   }
 
+  // Make sure all processors start at the same point for random sampling. Then
+  // skip ahead in the sequence using the starting index in the 'global'
+  // fission bank for each processor.
+
+  int64_t id = simulation::total_gen + overall_generation();
+  uint64_t seed = init_seed(id, STREAM_TRACKING);
+  advance_prn_seed(start, &seed);
+
+  // Determine how many fission sites we need to sample from the source bank
+  // and the probability for selecting a site.
+
+  int64_t sites_needed;
+  if (total < settings::n_particles) {
+    sites_needed = settings::n_particles % total;
+  } else {
+    sites_needed = settings::n_particles;
+  }
+  double p_sample = static_cast<double>(sites_needed) / total;
+
   simulation::time_bank_sample.start();
 
+  // ==========================================================================
+  // SAMPLE N_PARTICLES FROM FISSION BANK AND PLACE IN TEMP_SITES
+
   // Allocate temporary source bank -- we don't really know how many fission
   // sites were created, so overallocate by a factor of 3
   int64_t index_temp = 0;
@@ -143,38 +165,33 @@ void synchronize_bank()
       temp_delayed_groups, temp_lifetimes, 3 * simulation::work_per_rank);
   }
 
-  // ==========================================================================
-  // SAMPLE N_PARTICLES FROM FISSION BANK AND PLACE IN TEMP_SITES
-
-  // We use Uniform Combing method to exactly get the targeted particle size
-  // [https://doi.org/10.1080/00295639.2022.2091906]
-
-  // Make sure all processors use the same random number seed.
-  int64_t id = simulation::total_gen + overall_generation();
-  uint64_t seed = init_seed(id, STREAM_TRACKING);
+  for (int64_t i = 0; i < simulation::fission_bank.size(); i++) {
+    const auto& site = simulation::fission_bank[i];
 
-  // Comb specification
-  double teeth_distance = static_cast<double>(total) / settings::n_particles;
-  double teeth_offset = prn(&seed) * teeth_distance;
-
-  // First and last hitting tooth
-  int64_t end = start + simulation::fission_bank.size();
-  int64_t tooth_start = std::ceil((start - teeth_offset) / teeth_distance);
-  int64_t tooth_end = std::floor((end - teeth_offset) / teeth_distance) + 1;
-
-  // Locally comb particles in fission_bank
-  double tooth = tooth_start * teeth_distance + teeth_offset;
-  for (int64_t i = tooth_start; i < tooth_end; i++) {
-    int64_t idx = std::floor(tooth) - start;
-    temp_sites[index_temp] = simulation::fission_bank[idx];
-    if (settings::ifp_on) {
-      copy_ifp_data_from_fission_banks(
-        idx, temp_delayed_groups[index_temp], temp_lifetimes[index_temp]);
+    // If there are less than n_particles particles banked, automatically add
+    // int(n_particles/total) sites to temp_sites. For example, if you need
+    // 1000 and 300 were banked, this would add 3 source sites per banked site
+    // and the remaining 100 would be randomly sampled.
+    if (total < settings::n_particles) {
+      for (int64_t j = 1; j <= settings::n_particles / total; ++j) {
+        temp_sites[index_temp] = site;
+        if (settings::ifp_on) {
+          copy_ifp_data_from_fission_banks(
+            i, temp_delayed_groups[index_temp], temp_lifetimes[index_temp]);
+        }
+        ++index_temp;
+      }
     }
-    ++index_temp;
 
-    // Next tooth
-    tooth += teeth_distance;
+    // Randomly sample sites needed
+    if (prn(&seed) < p_sample) {
+      temp_sites[index_temp] = site;
+      if (settings::ifp_on) {
+        copy_ifp_data_from_fission_banks(
+          i, temp_delayed_groups[index_temp], temp_lifetimes[index_temp]);
+      }
+      ++index_temp;
+    }
   }
 
   // At this point, the sampling of source sites is done and now we need to
@@ -200,6 +217,37 @@ void synchronize_bank()
   finish = index_temp;
 #endif
 
+  // Now that the sampling is complete, we need to ensure that we have exactly
+  // n_particles source sites. The way this is done in a reproducible manner is
+  // to adjust only the source sites on the last processor.
+
+  if (mpi::rank == mpi::n_procs - 1) {
+    if (finish > settings::n_particles) {
+      // If we have extra sites sampled, we will simply discard the extra
+      // ones on the last processor
+      index_temp = settings::n_particles - start;
+
+    } else if (finish < settings::n_particles) {
+      // If we have too few sites, repeat sites from the very end of the
+      // fission bank
+      sites_needed = settings::n_particles - finish;
+      // TODO: sites_needed > simulation::fission_bank.size() or other test to
+      // make sure we don't need info from other proc
+      for (int i = 0; i < sites_needed; ++i) {
+        int i_bank = simulation::fission_bank.size() - sites_needed + i;
+        temp_sites[index_temp] = simulation::fission_bank[i_bank];
+        if (settings::ifp_on) {
+          copy_ifp_data_from_fission_banks(i_bank,
+            temp_delayed_groups[index_temp], temp_lifetimes[index_temp]);
+        }
+        ++index_temp;
+      }
+    }
+
+    // the last processor should not be sending sites to right
+    finish = simulation::work_index[mpi::rank + 1];
+  }
+
   simulation::time_bank_sample.stop();
   simulation::time_bank_sendrecv.start();
 

src/eigenvalue.cpp

@@ -92,7 +92,6 @@ int openmc_finalize()
   settings::max_lost_particles = 10;
   settings::max_order = 0;
   settings::max_particles_in_flight = 100000;
-  settings::max_secondaries = 10000;
   settings::max_particle_events = 1'000'000;
   settings::max_history_splits = 10'000'000;
   settings::max_tracks = 1000;